1 files changed, 10 insertions, 39 deletions
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 82d4989007a..5e1b901737d 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -6,65 +6,36 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 unshift @INC, '../../../../bin';
-require ACEutils;
 require Process;
 
 $NS_ior = "NameService.ior";
 $sleeptime = 5;
-$status = 0;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT.
                        " -o $NS_ior ");
-
-if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
-  print STDERR "ERROR: waiting for naming service IOR file\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  exit 1;
-}
+sleep $sleeptime;
 
 $ES = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Event_Service".$DIR_SEPARATOR.
-                       "Event_Service".$EXE_EXT,
-		       "-ORBNameServiceIOR file://$NS_ior -t new");
-
-sleep $sleeptime;
+                       "Event_Service".$EXE_EXT);
 
-$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT,
-		      "-ORBNameServiceIOR file://$NS_ior");
+$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT);
 
 sleep $sleeptime;
 
-$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT,
-		      "-ORBNameServiceIOR file://$NS_ior");
+$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT);
 
-if ($C->TimedWait (60) == -1) {
-  $status = 1;
-  print STDERR "ERROR: consumer timedout\n";
-  $C->Kill (); $C->TimedWait (1);
-}
+$C->Wait ();
+$S->Wait ();
 
-if ($S->TimedWait (60) == -1) {
-  $status =1;
-  print STDERR "ERROR: supplier timedout\n";
-  $S->Kill (); $S->TimedWait (1);
-}
-
-$NS->Terminate();
-$ES->Terminate();
-if ($NS->TimedWait (5) == -1 || $ES->TimedWait (5) == -1) {
-  print STDERR "ERROR: couldn't terminate the services nicely\n";
-  $NS->Kill (); $NS->TimedWait (1);
-  $ES->Kill (); $ES->TimedWait (1);
-  $status = 1;
-}
+$NS->Kill (); $NS->Wait ();
+$ES->Kill (); $ES->Wait ();
 
 unlink $NS_ior;
 
 # @@ Capture the errors from the processes.
-exit $status;
-
-
+exit 0;