1 files changed, 23 insertions, 9 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
index 1fd11af7dd7..ea92c470eee 100755
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
@@ -11,8 +11,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../../bin';
 require Process;
 require Uniqueid;
-
-$prefix = "." . $DIR_SEPARATOR;
+use Cwd;
+
+$cwd = getcwd();
+for($i = 0; $i <= $#ARGV; $i++) {
+  if ($ARGV[$i] eq '-chorus') {
+    $i++;
+    if (defined $ARGV[$i]) {
+      $EXEPREFIX = "rsh $ARGV[$i] arun $cwd$DIR_SEPARATOR";
+    }
+    else {
+      print STDERR "The -chorus option requires the hostname of the target\n";
+      exit(1);
+    }
+  }                     
+}
+$prefix = $EXEPREFIX . "." . $DIR_SEPARATOR;
 $status = 0;
 
 print STDERR "\n\nReconnect suppliers and consumers,",
@@ -46,7 +60,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nGateway test\n";
 $T = Process::Create ($prefix . "Gateway".$EXE_EXT,
-                      " -ORBsvcconf observer.conf");
+                      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "observer.conf");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -56,7 +70,7 @@ if ($T->TimedWait (60) == -1) {
 print STDERR "\n\nComplex event channel test,",
   "multiple ECs connected through gateways\n";
 $T = Process::Create ($prefix . "Observer".$EXE_EXT,
-                      " -ORBsvcconf observer.conf"
+                      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "observer.conf"
                       ." -consumer_tshift 0 -consumers 5"
                       ." -supplier_tshift 0 -suppliers 2"
                       ." -burstsize 10 -burstcount 10 -burstpause 0");
@@ -92,7 +106,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nBitmask tests\n";
 $T = Process::Create ($prefix . "Bitmask".$EXE_EXT,
-                      " -ORBSvcConf svc.complex.conf");
+                      " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.complex.conf");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -109,7 +123,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nMT Disconnects test\n";
 $T = Process::Create ($prefix . "MT_Disconnect".$EXE_EXT,
-                     " -ORBSvcConf mt.svc.conf");
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "mt.svc.conf");
 if ($T->TimedWait (240) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -118,7 +132,7 @@ if ($T->TimedWait (240) == -1) {
 
 print STDERR "\n\nAtomic Reconnection test\n";
 $T = Process::Create ($prefix . "Atomic_Reconnect".$EXE_EXT,
-                     " -ORBSvcConf mt.svc.conf");
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "mt.svc.conf");
 if ($T->TimedWait (120) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -127,7 +141,7 @@ if ($T->TimedWait (120) == -1) {
 
 print STDERR "\n\nComplex filter\n";
 $T = Process::Create ($prefix . "Complex".$EXE_EXT,
-                     " -ORBSvcConf svc.complex.conf");
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.complex.conf");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
@@ -136,7 +150,7 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nControl test\n";
 $T = Process::Create ($prefix . "Control".$EXE_EXT,
-                      " -ORBSvcConf control.conf");
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "control.conf");
 if ($T->TimedWait (60) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;