1 files changed, 8 insertions, 28 deletions
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index ca23c064b4e..a5533c0989c 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -9,34 +9,14 @@ unshift @INC, '../../../bin';
 require ACEutils;
 
 $iorfile = "server.ior";
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
-                       " -f $iorfile");
-
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."client$EXE_EXT",
-                       " -f $iorfile");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Terminate (); $server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", " -f $iorfile");
 
-unlink $iorfile;
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile");
 
-if ($server == -1 || $client != 0) {
-  exit 1;
-}
+$SV->Kill (); $SV->Wait ();
+
+unlink $iorfile;
 
-exit 0;
+exit $status;