1 files changed, 24 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
index 6a00abf4556..2b1114cbaa0 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
@@ -8,26 +8,31 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "../../../../bin";
 
 require ACEutils;
+use Cwd;
 
 $con_count = 10;
 $sup_count = 10;
 $ev_count = 8;
 $status = 0;
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 on Chorus 4.0
 
 sub cosec_multiple_test2
 {
     # first start the Naming service..
-    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Server".$EXE_EXT, "");
+    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT,
+                            "-ORBNameServicePort $port");
 
     sleep 10;
 
     # now start the Rt EC..
-    $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT, "");
+    $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT,
+                            "-ORBNameServicePort $port");
 
     sleep 10;
 
     # now start the CosEC1..
-    $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT, "");
+    $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT,
+                            "-ORBNameServicePort $port");
 
     sleep 10;
 
@@ -36,7 +41,7 @@ sub cosec_multiple_test2
     {
         print "creating consumer# $cntr1\n";
         $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT,
-                                 "-c $ev_count");
+                                 "-ORBNameServicePort $port -c $ev_count");
         sleep 10;
     }
 
@@ -46,7 +51,7 @@ sub cosec_multiple_test2
     {
         print "creating supplier# $cntr2\n";
         $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT,
-                                 "-c $ev_count");
+                                 "-ORBNameServicePort $port -c $ev_count");
         sleep 10;
     }
 
@@ -86,7 +91,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
   {
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
     {
-        print "usage: run_test2.pl -e event_count -c consumers -s suppliers -h help\n";
+        print "usage: run_test2.pl [-chorus <target>] -e event_count -c consumers -s suppliers -h help\n";
         exit;
     }
     if ($ARGV[$i] eq "-e")
@@ -107,7 +112,19 @@ for ($i = 0; $i <= $#ARGV; $i++)
         $i++;
         last SWITCH;
     }
-}
+    if ($ARGV[$i] eq '-chorus') {
+      $i++;
+      if (defined $ARGV[$i]) {
+        $cwd = getcwd();
+        $EXEPREFIX = "rsh $ARGV[$i] arun $cwd$DIR_SEPARATOR";
+      }
+      else {
+        print STDERR "The -chorus option requires the hostname of the target\n";
+        exit(1);
+      }
+      last SWITCH;
+    }
+  }
 }