1 files changed, 24 insertions, 20 deletions
diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl
index 10b76ffd9ef..b6e9fff38d0 100755
--- a/TAO/tests/Smart_Proxies/run_test.pl
+++ b/TAO/tests/Smart_Proxies/run_test.pl
@@ -5,41 +5,45 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-i file://$iorfile");
+unlink $iorfile;
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                        "-i file://$iorfile");
 
+$client = $CL->TimedWait (60);
 if ($client == -1) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
+$server = $SV->TimedWait (10);
 if ($server == -1) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0 || server != 0) {
+  exit 1;
+}