1 files changed, 7 insertions, 26 deletions
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index 5adff0ff273..659f8671712 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -29,34 +29,15 @@ $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT ",
                        " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
                        . " -o $iorfile");
 
-if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."$client_process$Process::EXE_EXT ",
-		       " -ORBsvcconf $client_conf "
-		       . "-ORBdebuglevel $debug_level"
-		       . " -k file://$iorfile "
-		       . " -n $threads -i 1000");
+ACE::waitforfile ($iorfile);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
+$status  = system ($EXEPREFIX."$client_process$Process::EXE_EXT "
+                   . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level"
+                   . " -k file://$iorfile "
+                   . " -n $threads -i 1000");
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
-exit 0;
+exit $status;