1 files changed, 20 insertions, 44 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index 13aee01facd..6e87920f5eb 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -1,80 +1,56 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
+$tao_root = $ENV{TAO_ROOT};
+# This is a Perl script that runs the Naming Service, client and servers
 
 unshift @INC, '../../../../../bin';
 require Process;
-require ACEutils;
+require Uniqueid;
 
 # amount of delay between running the servers
 
 $sleeptime = 6;
-$status = 0;
-local $nsior = "ns.ior";
 
 # variables for parameters
 
+$nsport = 20000 + uniqueid ();
 sub name_server
 {
-    my $args = "-o $nsior";
-    my $prog = "..".$DIR_SEPARATOR
-      ."..".$DIR_SEPARATOR
-	."..".$DIR_SEPARATOR
-	  ."Naming_Service".$DIR_SEPARATOR
-	."Naming_Service ".$EXE_EXT;
-    print ("\nNaming_Service $args\n");
+    my $args = "-ORBnameserviceport $nsport";
+    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service"
+	.$Process::EXE_EXT;
+    print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n");
     $NS = Process::Create ($prog, $args);
-    if (ACE::waitforfile_timed ($nsior, 5) == -1) {
-      print STDERR "ERROR: cannot find naming service IOR file\n";
-      $NS->Kill (); $NS->TimedWait (1);
-      exit 1;
-    }
 }
 
 
 sub server
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nServer: $args\n");
-    $SV = Process::Create (".".$DIR_SEPARATOR."server".$EXE_EXT, $args);
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nServer: server$Process::EXE_EXT $args\n");
+    $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", $args);
 }
 
 
 sub client
 {
-    my $args = "-ORBNameServiceIOR file://$nsior";
-    print ("\nclient: $args\n");
-    $CL = Process::Create (".".$DIR_SEPARATOR."client".$EXE_EXT, $args);
+    my $args = "-ORBnameserviceport $nsport";
+    print ("\nclient: client $args\n");
+    $CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT", $args);
 }
 
 name_server ();
+sleep $sleeptime;
 
 server ();
-
 sleep $sleeptime;
 
 client ();
+$CL->Wait ();
 
-if ($CL->TimedWait (60) == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $status = 1;
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate server\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-  
-$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
-  print STDERR "ERROR: cannot terminate naming service\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
-  
-exit $status;
+$NS->Kill (); $NS->Wait ();
+$SV->Kill (); $SV->Wait ();