1 files changed, 9 insertions, 28 deletions
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index e0fae9a8394..f81e9b9c09a 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -12,33 +12,14 @@ $iorfile = "server.ior";
 
 unlink $iorfile;
 
-$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $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$EXE_EXT ",
-		       " -f $iorfile -x");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
-  
-unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", " -f $iorfile");
+
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x");
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
+$SV->Wait ();
+
+unlink $iorfile;
 
-exit 0;
+exit $status;