1 files changed, 4 insertions, 19 deletions
diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl
index 31d1ba57a89..7c1e18a1afc 100755
--- a/TAO/examples/Simple/grid/run_test.pl
+++ b/TAO/examples/Simple/grid/run_test.pl
@@ -9,30 +9,15 @@ use lib "../../../../bin";
 require ACEutils;
 require Process;
 
-$status = 0;
 $iorfile = "grid.ior";
 
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile ");
 
-if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
-  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
+ACE::waitforfile ($iorfile);
 
-$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
 
-if ($client->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $client->Kill (); $client->TimedWait (1);
-}
-
-if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate the server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $status = 1;
-}
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;