1 files changed, 17 insertions, 56 deletions

diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 3502343dc7b..1068b4866cd 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -10,7 +10,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 unshift @INC, '../../../../bin';
 require Process;
-require ACEutils;
 require Uniqueid;
 
 # amount of delay between running the servers
@@ -20,32 +19,22 @@ $sleeptime = 8;
 # variables for parameters
 
 $nsmport = 10000 + uniqueid ();
-$iorfile = "ns.ior";
 
 sub name_server
 {
-  my $args = "-ORBnameserviceport $nsmport -o $iorfile";
-  my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
-    "Naming_Service".$DIR_SEPARATOR.
-      "Naming_Service".$EXE_EXT;
+  my $args = "-ORBnameserviceport $nsmport";
+  my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Naming_Service".$DIR_SEPARATOR.
+             "Naming_Service".$Process::EXE_EXT;
 
-  unlink $iorfile;
   $NS = Process::Create ($prog, $args);
-
-  if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-  }
 }
 
 sub client
 {
-  my $args = $_[0]." "."-ORBnameserviceport $nsmport ".
-    "-ORBnameserviceior file://$iorfile";
-  my $prog = $EXEPREFIX."client".$EXE_EXT;
+  my $args = $_[0]." "."-ORBnameserviceport $nsmport";
+  my $prog = $EXEPREFIX."client".$Process::EXE_EXT;
 
-  $CL = Process::Create ($prog, $args);
+  system ($prog." ".$args);
 }
 
 # Options for all tests recognized by the 'client' program.
@@ -64,28 +53,17 @@ foreach $o (@opts)
 {
   name_server ();
 
-  print STDERR "\n";
-  print STDERR "          ".$comments[$test_number];
+  sleep $sleeptime;
+  print "\n";
+  print "          ".$comments[$test_number];
 
   client ($o);
-  $client = $CL->TimedWait (60);
-  if ($client == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $CL->Kill (); $CL->TimedWait (1);
-  }
-
-
-  $NS->Terminate (); $server = $NS->TimedWait (5);
-  if ($server == -1) {
-    print STDERR "ERROR: server timedout\n";
-    $NS->Kill (); $NS->TimedWait (1);
-  }
+
+  $NS->Kill ();
   $test_number++;
 }
 
-print STDERR "\n";
-
-print STDERR "          Multithreaded Test:\n";
+print "\n";
 
 # Now run the multithreaded test, sending output to the file.
 open (OLDOUT, ">&STDOUT");
@@ -94,36 +72,19 @@ open (OLDERR, ">&STDERR");
 open (STDERR, ">&STDOUT") or die "can't redirect stderror: $!";
 
 name_server ();
-
+sleep $sleeptime;
 client ("-m25");
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
 close (STDERR);
 close (STDOUT);
 open (STDOUT, ">&OLDOUT");
 open (STDERR, ">&OLDERR");
 
-$NS->Terminate (); $server = $NS->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $NS->Kill (); $NS->TimedWait (1);
-}
-
-unlink $iorfile;
+$NS->Kill ();
 
-$FL = Process::Create ($EXEPREFIX."process-m-output.pl",
-                       " test_run.data 25");
-$filter = $FL->TimedWait (60);
-if ($filter == -1) {
-  print STDERR "ERROR: filter timedout\n";
-  $FL->Kill (); $FL->TimedWait (1);
-}
-print STDERR "\n";
+print "          Multithreaded Test:\n";
+system ("process-m-output.pl test_run.data 25");
+print "\n";
 
 # @@ Capture any exit status from the processes.
 exit 0;