Mon Nov 24 11:21:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 36 insertions, 12 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a6ffee843b7..fbb1547626e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov 24 11:21:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessWinCE.pm:
+          Delete the copied dll's when ACE_TEST_VERBOSE is not defined
+
+        * bin/PerlACE/TestTarget_VxWorks.pm:
+          We have to wait on a file that appears on the host file system,
+          we can't wait on the real target
+
+        * bin/PerlACE/TestTarget_WinCE.pm:
+          No need to override GetFile
+
 Mon Nov 24 10:46:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-hpux-11.00.h:
diff --git a/ACE/bin/PerlACE/ProcessWinCE.pm b/ACE/bin/PerlACE/ProcessWinCE.pm
index 9726d901a11..7556c68bdbb 100644
--- a/ACE/bin/PerlACE/ProcessWinCE.pm
+++ b/ACE/bin/PerlACE/ProcessWinCE.pm
@@ -173,8 +173,10 @@ sub Spawn ()
             @cmds[$cmdnr++] = 'cd ' . $ENV{'ACE_RUN_VX_TGTSVR_ROOT'} . "/" . $cwdrel;
         }
         @cmds[$cmdnr++] = $cmdline;
-        push @cmds, @unload_commands;
-        $cmdnr += scalar @unload_commands;
+        if (!defined $ENV{'ACE_TEST_VERBOSE'}) {
+          push @cmds, @unload_commands;
+          $cmdnr += scalar @unload_commands;
+        }
         $prompt = '\> $';
 
     print $oh "require Net::Telnet;\n";
@@ -343,7 +345,7 @@ sub handle_vxtest_file
       $line1 = $_;
       chomp $line1;
       push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/$line1" . "d.dll .";
-      #unshift @$unld_ref, "del $line1" . "d.dll";
+      unshift @$unld_ref, "del $line1" . "d.dll";
     }
     close $fh;
   } else {
diff --git a/ACE/bin/PerlACE/TestTarget_VxWorks.pm b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
index 9c6351a98bc..bbd99b068dd 100644
--- a/ACE/bin/PerlACE/TestTarget_VxWorks.pm
+++ b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
@@ -16,6 +16,7 @@ use strict;
 
 use PerlACE::TestTarget;
 use PerlACE::ProcessVX;
+use Cwd;
 
 our @ISA = qw(PerlACE::TestTarget);
 
@@ -25,7 +26,7 @@ our @ISA = qw(PerlACE::TestTarget);
 
 sub LocalFile {
   my($self, $file) = @_;
- if (defined $ENV{'ACE_TEST_VERBOSE'}) {
+  if (defined $ENV{'ACE_TEST_VERBOSE'}) {
     print STDERR "LocalFile is $file\n";
   }
   return $file;
@@ -53,4 +54,21 @@ sub RebootNow ($)
     reboot ();
 }
 
+sub WaitForFileTimed ($)
+{
+    my $self = shift;
+    my $file = shift;
+    my $timeout = shift;
+    my $cwdrel = $file;
+    my $prjroot = defined $ENV{"ACE_RUN_VX_PRJ_ROOT"} ? $ENV{"ACE_RUN_VX_PRJ_ROOT"}  : $ENV{"ACE_ROOT"};
+    if (length ($cwdrel) > 0) {
+        $cwdrel = File::Spec->abs2rel( cwd(), $prjroot );
+    }
+    else {
+        $cwdrel = File::Spec->abs2rel( $cwdrel, $prjroot );
+    }
+    my $newfile = $self->{HOST_ROOT} . "/" . $cwdrel . "/" . $file;
+    return PerlACE::waitforfile_timed ($newfile, $timeout);
+}
+
 1;
diff --git a/ACE/bin/PerlACE/TestTarget_WinCE.pm b/ACE/bin/PerlACE/TestTarget_WinCE.pm
index 002816564ca..b1d650e5c88 100644
--- a/ACE/bin/PerlACE/TestTarget_WinCE.pm
+++ b/ACE/bin/PerlACE/TestTarget_WinCE.pm
@@ -83,7 +83,6 @@ sub new
     return $self;
 }
 
-
 # ******************************************************************
 # Subroutine Section
 # ******************************************************************
@@ -148,13 +147,6 @@ sub WaitForFileTimed ($)
     return PerlACE::waitforfile_timed ($newfile, $timeout);
 }
 
-sub GetFile ($)
-{
-    my $self = shift;
-    my $file = shift;
-    return 0;
-}
-
 # Put file from a to b
 sub PutFile ($)
 {