ChangeLogTag: Wed Feb 16 07:02:15 2005 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
index f6d973fdad0..64ae0b204fb 100644
--- a/bin/PerlACE/Process_Unix.pm
+++ b/bin/PerlACE/Process_Unix.pm
@@ -224,6 +224,9 @@ sub Spawn ()
 
         $cmdline = "$executable $orig_cmdline"; 
     }
+    elsif (defined $ENV{'ACE_TEST_WINDOW'}) {
+      $cmdline = $ENV{'ACE_TEST_WINDOW'} . ' ' . $self->CommandLine();
+    }
     else {
         $executable = $self->Executable();
         $cmdline = $self->CommandLine();
@@ -237,6 +240,9 @@ sub Spawn ()
         }
         elsif (defined $self->{PROCESS}) {
             #child here
+            if (defined $ENV{'ACE_TEST_VERBOSE'}) {
+              print "$cmdline\n";
+            }
             exec $cmdline;
             die "ERROR: exec failed for <" . $cmdline . ">";
         }
@@ -353,7 +359,7 @@ sub Kill ()
 {
     my $self = shift;
 
-    if ($self->{RUNNING}) {
+    if ($self->{RUNNING} && !defined $ENV{'ACE_TEST_WINDOW'}) {
         kill ('KILL', $self->{PROCESS});
         waitpid ($self->{PROCESS}, 0);
         $self->check_return_value ($?);
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index d83f333e118..96afbb18934 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -244,10 +244,17 @@ sub Spawn ()
         my $pocket_device_opts = $ENV{"ACE_PCE_DEVICE"};
         $cmdline = "cmd /C start /B /WAIT $self->{WINCE_CTL} $pocket_device_opts -m NAME=start_test.cmd;WAIT=401000; -e"
     }
+    elsif (defined $ENV{'ACE_TEST_WINDOW'}) {
+      $executable = $ENV{'ACE_TEST_WINDOW'};
+      $cmdline = $self->Executable () . ' ' . $self->CommandLine();
+    }
     else {
         $executable = $self->Executable ();
         $cmdline = $self->CommandLine ();
     }
+    if (defined $ENV{'ACE_TEST_VERBOSE'}) {
+      print "$executable $cmdline\n";
+    }
     Win32::Process::Create ($self->{PROCESS},
                             $executable,
                             $cmdline,
@@ -311,7 +318,7 @@ sub Kill ()
 {
     my $self = shift;
 
-    if ($self->{RUNNING}) {
+    if ($self->{RUNNING}  && !defined $ENV{'ACE_TEST_WINDOW'}) {
         Win32::Process::Kill ($self->{PROCESS}, -1);
     }