1 files changed, 10 insertions, 35 deletions

diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 72d6fbc2351..e4f26e66b5f 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -24,7 +24,6 @@ $sleeptime = 2;
 
 # other variables
 
-$status = 0;
 $n = 1;
 $leave = 1;
 $ior = 0;
@@ -91,17 +90,12 @@ sub generic_factory
 
 sub client
 {
-  my $exe = $EXEPREFIX."client$EXE_EXT";
-  my $args2 = "$other -l $debug $cm ".
+  my $exe = $EXEPREFIX."client$EXE_EXT $other -l $debug $cm ".
             "-ORBnameserviceior $ior -ORBsvcconf $c_conf";
+
   for ($j = 0; $j < $n; $j++)
   {
-    $client_ = Process::Create($exe, $args2);
-    if ( $client_->TimedWait (60) ) {
-      print STDERR "ERROR: a client has timedout\n";
-      $status = 1;
-      $client_->Kill (); $client_->TimedWait (1);
-    }
+    system ($exe);
   }
 }
 
@@ -113,7 +107,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
   {
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
     {
-      print "run_test [-n num] [-leave] [-onewin]".
+      print "run_test [-n num] [-leave] [-onewin]"
 	"[-twowin] [-d] [-h] [-nt] [-cm] [-sm] [-ns|sv|ff|cl|gf]\n";
       print "\n";
       print "-n num              -- runs the client num times\n";
@@ -238,31 +232,12 @@ client ();
 
 if ($leave)
 {
-  $GF->Terminate ();
-  $FF->Terminate ();
-  $SV->Terminate ();
-  $LC->Terminate ();
-  $NS->Terminate ();
-  if ($GF->TimedWait (5) == -1 ||
-      $FF->TimedWait (5) == -1 ||
-      $SV->TimedWait (5) == -1 ||
-      $LC->TimedWait (5) == -1 ||
-      $NS->TimedWait (5) == -1){
-    print STDERR "ERROR: couldn't terminate services nicely\n";
-    $status = 1;
-    $GF->Kill (); $GF->TimedWait (1);
-    $FF->Kill (); $FF->TimedWait (1);
-    $SV->Kill (); $SV->TimedWait (1);
-    $LC->Kill (); $LC->TimedWait (1);
-    $NS->Kill (); $NS->TimedWait (1);
-  }
+  $GF->Kill ();
+  $FF->Kill ();
+  $SV->Kill ();
+  $LC->Kill ();
+  $NS->Kill ();
+}
 
 
 unlink $nsiorfile;
-
-if ($status != 0)
-{
-    exit 1;
-}
-
-exit 0;