1 files changed, 6 insertions, 40 deletions
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 08f9d16e7b7..362b45423b0 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -59,49 +59,15 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
 
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1) {
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-if ($server != 0 || $client_1 != 0 || $client_2 != 0) {
-  exit 1;
-}
-
-exit 0;
+$SV->Wait ();
 
+exit $status;