1 files changed, 29 insertions, 22 deletions
diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl
index 457e4f7df29..9d1a922cb34 100755
--- a/TAO/tests/Nested_Event_Loop/run_test.pl
+++ b/TAO/tests/Nested_Event_Loop/run_test.pl
@@ -5,39 +5,46 @@ 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" . "ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
+unlink $iorfile;
 
-$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 (); $SV->TimedWait (1);
-    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 (200);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-k file://$iorfile -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (200);
+if ($client == -1) {
+  $time = localtime;
+  print STDERR "ERROR: client timedout at $time\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (100);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (100);
+if ($server == -1) {
+  $time = localtime;
+  print STDERR "ERROR: server timedout at $time\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;