diff options
50 files changed, 939 insertions, 177 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 2385afcfcdd..a07cf5b7327 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,50 @@ +Fri Apr 7 11:12:07 2000 Chad Elliott <elliott_c@ociweb.com> + + * tests/AMI/run_test.pl, tests/CDR/run_test.pl, + tests/Connection_Purging/run_test.pl, + tests/DSI_Gateway/run_test.pl, tests/DynAny_Test/run_test.pl, + tests/Endpoint_Per_Priority/run_test.pl, + tests/Explicit_Event_Loop/run_test.pl, + tests/Faults/run_test.pl, + tests/IORManipulation/run_test.pl, tests/InterOp-Naming/run_test.pl, + tests/Interceptors/client.cpp + tests/Interceptors/run_test.pl, tests/Leader_Followers/run_test.pl, + tests/MT_Client/run_test.pl, tests/POA/Deactivation/run_test.pl, + tests/POA/Destruction/run_test.pl, tests/POA/Identity/run_test.pl, + tests/MT_Server/run_test.pl, tests/Multiple_Inheritance/run_test.pl, + tests/Native_Exceptions/run_test.pl, + tests/NestedUpcall/MT_Client_Test/run_test.pl, + tests/NestedUpcall/Simple/run_test.pl, + tests/NestedUpcall/Triangle_Test/run_test.pl, + tests/Nested_Event_Loop/run_test.pl, + tests/ORB_init/run_test.pl, tests/OctetSeq/run_test.pl, + tests/Param_Test/run_test.pl, tests/Smart_Proxies/run_test.pl, + tests/Smart_Proxies/On_Demand/run_test.pl, + tests/Timed_Buffered_Oneways/run_test.pl, tests/Timeout/run_test.pl, + orbsvcs/tests/AVStreams/benchmark/run_test.pl, + orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp, + orbsvcs/tests/CosEC_Multiple/run_test.pl, + orbsvcs/tests/CosEC_Multiple/run_test2.pl, + orbsvcs/tests/CosEvent/Basic/run_test.pl, + orbsvcs/tests/EC_Basic/run_test.pl, + orbsvcs/tests/EC_Custom_Marshal/run_test.pl, + orbsvcs/tests/EC_Mcast/run_test.pl, + orbsvcs/tests/EC_Multiple/run_test.pl, + orbsvcs/tests/EC_Throughput/run_test.pl, + orbsvcs/tests/Event/Basic/run_test.pl, + orbsvcs/tests/Event/Performance/run_test.pl, + orbsvcs/tests/Event_Latency/run_test.pl, + orbsvcs/tests/ImplRepo/run_test.pl, + orbsvcs/tests/Property/run_test.pl, + orbsvcs/tests/Simple_Naming/run_test.pl, + orbsvcs/tests/Time/run_test.pl, + orbsvcs/tests/Trading/export_test.cpp, + orbsvcs/tests/Trading/run_test.pl + + Added a -chorus option to allow running the tests on a chorus + target. Modified some test c++ code to give options to set input + files. + Tue Apr 4 10:45:00 2000 Chris Gill <cdgill@cs.wustl.edu> * orbsvcs/tests/Makefile: added Sched directory diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl index eba0a1d57f5..907011f22be 100755 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl @@ -8,16 +8,31 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../../bin'; require Process; require ACEutils; +use Cwd; # amount of delay between running the servers $sleeptime = 6; $status = 0; -local $nsior = "ns.ior"; +$cwd = getcwd(); +local $nsior = "$cwd$DIR_SEPARATOR" . "ns.ior"; + +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); + } + } +} -$name_server_prog = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."Naming_Service".$DIR_SEPARATOR."Naming_Service".$EXE_EXT; -$server_prog = ".".$DIR_SEPARATOR."server".$EXE_EXT; -$client_prog = ".".$DIR_SEPARATOR."client".$EXE_EXT; +$name_server_prog = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."Naming_Service".$DIR_SEPARATOR."Naming_Service".$EXE_EXT; +$server_prog = $EXEPREFIX.".".$DIR_SEPARATOR."server".$EXE_EXT; +$client_prog = $EXEPREFIX.".".$DIR_SEPARATOR."client".$EXE_EXT; # variables for parameters diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp index afcc867ed5b..5b7ea6529d7 100644 --- a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp +++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp @@ -19,14 +19,14 @@ CosEC_Multiple::~CosEC_Multiple (void) int CosEC_Multiple::init (int argc, char *argv[]) { - if (this->parse_args (argc, argv) == -1) + if (init_ORB (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "parse error returned error.\n"), + "init_ORB returned error.\n"), -1); - if (init_ORB (argc, argv) == -1) + if (this->parse_args (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "init_ORB returned error.\n"), + "parse error returned error.\n"), -1); if (init_CosEC () == -1) diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl index 78ee631e29b..e02c14efbf2 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl @@ -8,10 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../../bin"; require ACEutils; +use Cwd; #event count $ev_count = 2; $status = 0; +$port = ACE::uniqueid () + 10001; # This can't be 10000 on Chorus 4.0 # setup CosEC params such that.. # cos event service name = "cosec1" @@ -28,44 +30,50 @@ $CosEC2_params = "-n cosec2 -e 20 -o 5 -p \"6 21\""; sub cosec_multiple_test1 { # first start the Naming service.. - $SV1 = Process::Create ("..".$DIR_SEPARATOR + $SV1 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."Naming_Service".$DIR_SEPARATOR - ."Naming_Service".$EXE_EXT, ""); + ."Naming_Service".$EXE_EXT, + "-ORBNameServicePort $port"); sleep 10; # now start the Rt EC.. - $SV2 = Process::Create ("..".$DIR_SEPARATOR + $SV2 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."Event_Service".$DIR_SEPARATOR - ."Event_Service".$EXE_EXT, "-t new"); + ."Event_Service".$EXE_EXT, + "-t new -ORBNameServicePort $port"); sleep 10; # now start the CosEC1.. - $SV3 = Process::Create ("..".$DIR_SEPARATOR + $SV3 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."CosEvent_Service".$DIR_SEPARATOR - ."CosEvent_Service".$EXE_EXT, $CosEC1_params); + ."CosEvent_Service".$EXE_EXT, + "-ORBNameServicePort $port $CosEC1_params"); sleep 10; # now start the CosEC2.. - $SV4 = Process::Create ("..".$DIR_SEPARATOR + $SV4 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."CosEvent_Service".$DIR_SEPARATOR - ."CosEvent_Service".$EXE_EXT, $CosEC2_params); + ."CosEvent_Service".$EXE_EXT, + "-ORBNameServicePort $port $CosEC2_params"); sleep 10; #start 1 consumer that uses CosEC1 to receive events - $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, "-n cosec1 -c $ev_count"); + $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, + "-ORBNameServicePort $port -n cosec1 -c $ev_count"); sleep 10; #start 1 supplier that uses CosEC2 to send events - $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, "-n cosec2 -c $ev_count"); + $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, + "-ORBNameServicePort $port -n cosec2 -c $ev_count"); sleep 10; @@ -86,12 +94,14 @@ sub cosec_multiple_test1 #---------- #start 1 consumer that uses CosEC1 to receive events - $CONS2 = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, "-n cosec2 -c $ev_count"); + $CONS2 = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, + "-ORBNameServicePort $port -n cosec2 -c $ev_count"); sleep 10; #start 1 supplier that uses CosEC2 to send events - $SUPP2 = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, "-n cosec1 -c $ev_count"); + $SUPP2 = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, + "-ORBNameServicePort $port -n cosec1 -c $ev_count"); sleep 10; @@ -142,7 +152,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { - print "usage: run_test.pl -e event_count -h help\n"; + print "usage: run_test.pl [-chorus <target>] -e event_count -h help\n"; exit; } if ($ARGV[$i] eq "-e") @@ -151,7 +161,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; + } + } } cosec_multiple_test1 (); 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; + } + } } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl index 6b861e791de..552c87b61da 100755 --- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl @@ -11,8 +11,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../../bin'; require Process; require Uniqueid; +use Cwd; -$prefix = "." . $DIR_SEPARATOR; +$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\nShutdown EC with clients still attached\n"; @@ -49,7 +64,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nPull-Push Events\n"; $T = Process::Create ($prefix . "Pull_Push_Event".$EXE_EXT, - " -ORBSvcConf svc.pull.conf"); + " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.pull.conf"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: Test timedout\n"; $status = 1; diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl index de8e80bc32f..1acfdb7ec25 100755 --- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl @@ -8,8 +8,24 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; require Process; +use Cwd; + +$cwd = getcwd(); $status = 0; +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); + } + } +} + $TEST = Process::Create ($EXEPREFIX."EC_Basic".$EXE_EXT, ""); if ($TEST->TimedWait (60) == -1) { diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index 04a780c5c30..b2e1e2c76c7 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -8,16 +8,32 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; require Process; +use Cwd; -$NS_ior = "NameService.ior"; +$port = ACE::uniqueid () + 10001; # This can't be 10000 on Chorus 4.0 +$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); + } + } +} + +$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior"; $sleeptime = 5; $status = 0; -$NS = Process::Create ("..".$DIR_SEPARATOR. +$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. "Naming_Service".$EXE_EXT, - " -o $NS_ior "); + "-ORBNameServicePort $port -o $NS_ior "); if (ACE::waitforfile_timed ($NS_ior, 5) == -1) { print STDERR "ERROR: waiting for naming service IOR file\n"; @@ -25,7 +41,7 @@ if (ACE::waitforfile_timed ($NS_ior, 5) == -1) { exit 1; } -$ES = Process::Create ("..".$DIR_SEPARATOR. +$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Event_Service".$DIR_SEPARATOR. "Event_Service".$EXE_EXT, diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl index e9dd7a1b37f..e3a2cc618e8 100755 --- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl @@ -7,12 +7,29 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; +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); + } + } +} # Run two copies of the same test... $T1 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT, - " -c sample.cfg -n 100 -t 50000 -f Set02"); + " -c $cwd$DIR_SEPARATOR" . + "sample.cfg -n 100 -t 50000 -f Set02"); $T2 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT, - " -c sample.cfg -n 100 -t 50000 -f Set02"); + " -c $cwd$DIR_SEPARATOR" . + "sample.cfg -n 100 -t 50000 -f Set02"); if ($T1->TimedWait (60) == -1) { print STDERR "ERROR: test1 timedout\n"; diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 0f9b8554ce3..5cf03e33799 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -8,11 +8,26 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +use Cwd; -$NS_ior = "NameService.ior"; +$cwd = getcwd(); +$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior"; $status = 0; -$NS = Process::Create ("..".$DIR_SEPARATOR. +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); + } + } +} + +$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. "Naming_Service".$EXE_EXT, diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index 4ce0feffb86..f890aff5a59 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -8,14 +8,28 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; - +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); + } + } +} print STDERR "================ Collocated tests, single threaded\n"; $T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT, - " -ORBsvcconf ec.conf -m new -u 10000 -n 1 -t 0" - . " -c 4"); + " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.conf" . + " -m new -u 10000 -n 1 -t 0 -c 4"); -if ($T->TimedWait (60) == -1) { +if ($T->TimedWait (120) == -1) { print STDERR "ERROR: test timedout\n"; $T->Kill (); $T->TimedWait (1); exit 1; @@ -24,8 +38,8 @@ if ($T->TimedWait (60) == -1) { print STDERR "================ Collocated tests, single threaded\n"; $T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT, - " -ORBsvcconf ec.mt.conf -m new -u 10000 -n 1 -t 0" - . " -c 4"); + " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.mt.conf" . + " -m new -u 10000 -n 1 -t 0 -c 4"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: test timedout\n"; @@ -38,7 +52,7 @@ print STDERR "================ Remote test\n"; $ns_ior = "NameService.ior"; unlink $ns_ior; -$NS = Process::Create ("..".$DIR_SEPARATOR. +$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. "Naming_Service".$EXE_EXT, @@ -50,12 +64,12 @@ if (ACE::waitforfile_timed ($ns_ior, 5) == -1) { exit 1; } -$ES = Process::Create ("..".$DIR_SEPARATOR. +$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Event_Service".$DIR_SEPARATOR. "Event_Service".$EXE_EXT, " -ORBInitRef NameService=file://$ns_ior " - ." -ORBSvcConf ec.conf " + ." -ORBSvcConf $cwd$DIR_SEPARATOR" . "ec.conf " . " -t NEW"); sleep 5; 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; diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl index ac2e3808597..79c689bc399 100755 --- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl @@ -11,13 +11,28 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../../bin'; require Process; require Uniqueid; +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 = "." . $DIR_SEPARATOR; +$prefix = $EXEPREFIX . "." . $DIR_SEPARATOR; $status = 0; print STDERR "\n\nThroughput/Latency single threaded configuration\n"; $T = Process::Create ($prefix . "Throughput".$EXE_EXT, - " -ORBsvcconf ec.st.conf " + " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.st.conf " . "-burstsize 2000 -burstcount 1"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: Test timedout\n"; diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl index 0e7e7fbff42..ea841623d34 100755 --- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl +++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl @@ -8,12 +8,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +use Cwd; -$NS_ior = "NameService.ior"; +$cwd = getcwd(); +$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior"; $sleeptime = 3; $status = 0; -$NS = Process::Create ("..".$DIR_SEPARATOR +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); + } + } +} + +$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."Naming_Service".$DIR_SEPARATOR ."Naming_Service".$EXE_EXT, @@ -25,7 +40,7 @@ if (ACE::waitforfile_timed ($NS_ior, 5) == -1) { exit 1; } -$ES = Process::Create ("..".$DIR_SEPARATOR +$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."Event_Service".$DIR_SEPARATOR ."Event_Service".$EXE_EXT, @@ -33,7 +48,7 @@ $ES = Process::Create ("..".$DIR_SEPARATOR sleep $sleeptime; -$TEST = Process::Create (".".$DIR_SEPARATOR."Event_Latency".$EXE_EXT, +$TEST = Process::Create ($EXEPREFIX.".".$DIR_SEPARATOR."Event_Latency".$EXE_EXT, "-ORBInitRef NameService=file://$NS_ior" ." -j -m 100"); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index 39e7d46eee0..aa1c01d2f37 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -8,14 +8,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../../bin"; require ACEutils; +use Cwd; -$airplane_ior = "airplane.ior"; -$nestea_ior = "nestea.ior"; -$implrepo_ior = "implrepo.ior"; +$cwd = getcwd(); +$airplane_ior = "$cwd$DIR_SEPARATOR" . "airplane.ior"; +$nestea_ior = "$cwd$DIR_SEPARATOR" . "nestea.ior"; +$implrepo_ior = "$cwd$DIR_SEPARATOR" . "implrepo.ior"; $refstyle = " -ORBobjrefstyle URL"; -$implrepo_server = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". +$implrepo_server = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". $DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT; if ($^O eq "MSWin32") @@ -24,7 +26,7 @@ if ($^O eq "MSWin32") } else { - $tao_imr = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". + $tao_imr = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". $DIR_SEPARATOR."tao_imr".$EXE_EXT; } @@ -160,8 +162,9 @@ for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { - print "run_test test\n"; + print "run_test [-chorus <target>] test\n"; print "\n"; + print "-chorus <target> -- Runs the test on Chorus target\n"; print "test -- Runs a specific test\n"; print " airplane, airplane_ir, nestea, nestea_ir, both_ir\n"; exit; @@ -191,7 +194,17 @@ for ($i = 0; $i <= $#ARGV; $i++) both_ir_test (); exit; } - + 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); + } + last SWITCH; + } print "run_test: Unknown Option: ".$ARGV[$i]."\n"; } } diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index f88f1c8ae78..b20ed201d96 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -8,15 +8,30 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +use Cwd; +$cwd = getcwd(); # amount of delay between running the servers $sleeptime = 6; $status = 0; +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); + } + } +} + # variables for parameters -$nsior = "ns.ior"; +$nsior = "$cwd$DIR_SEPARATOR" . "ns.ior"; sub name_server { @@ -25,7 +40,7 @@ sub name_server print STDERR ("\nNaming_Service: $args\n"); unlink $nsior; - $NS = Process::Create ("..".$DIR_SEPARATOR + $NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."Naming_Service".$DIR_SEPARATOR ."Naming_Service".$EXE_EXT, $args); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index 3132177d3a1..2d48d3a293e 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -12,24 +12,39 @@ unshift @INC, '../../../../bin'; require Process; require ACEutils; require Uniqueid; +use Cwd; +$cwd = getcwd(); # Amount of delay (in seconds) between starting a server and a client # to allow proper server initialization. $sleeptime = 8; # Variables for command-line arguments to client and server # executables. -$ns_multicast_port = 10000 + uniqueid (); +$ns_multicast_port = 10001 + uniqueid (); # Can not be 10000 on Chorus 4.0 $ns_orb_port = 12000 + uniqueid (); -$iorfile = "ns.ior"; -$persistent_ior_file = "pns.ior"; -$persistent_log_file = "test_log"; -$data_file = "test_run.data"; +$iorfile = "$cwd$DIR_SEPARATOR" . "ns.ior"; +$persistent_ior_file = "$cwd$DIR_SEPARATOR" . "pns.ior"; +$persistent_log_file = "$cwd$DIR_SEPARATOR" . "test_log"; +$data_file = "$cwd$DIR_SEPARATOR" . "test_run.data"; + +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); + } + } +} sub name_server { my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile"; - my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR". + my $prog = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR". "Naming_Service".$DIR_SEPARATOR. "Naming_Service".$EXE_EXT; @@ -131,7 +146,7 @@ if ($server == -1) { unlink $iorfile; $FL = Process::Create ($EXEPREFIX."process-m-output.pl", - " test_run.data 15"); + " $data_file 15"); $filter = $FL->TimedWait (60); if ($filter == -1) { print STDERR "ERROR: filter timedout\n"; diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl index f3164e9c2d0..1925e74a876 100755 --- a/TAO/orbsvcs/tests/Time/run_test.pl +++ b/TAO/orbsvcs/tests/Time/run_test.pl @@ -8,10 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../../bin"; require ACEutils; +use Cwd; -$server_ior = "server_ior"; -$clerk_ior = "clerk_ior"; -$implrepo_ior = "implrepo.ior"; +$cwd = getcwd(); +$server_ior = "$cwd$DIR_SEPARATOR" . "server_ior"; +$clerk_ior = "$cwd$DIR_SEPARATOR" . "clerk_ior"; +$implrepo_ior = "$cwd$DIR_SEPARATOR" . "implrepo.ior"; $status = 0; # Make sure the files are gone, so we can wait on them. @@ -19,8 +21,8 @@ $status = 0; unlink $server_ior; unlink $clerk_ior; -$server_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Server".$EXE_EXT; -$clerk_program = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Clerk".$EXE_EXT; +$server_program = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Server".$EXE_EXT; +$clerk_program = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Clerk".$EXE_EXT; $client_program = $EXEPREFIX."client".$EXE_EXT; sub time_service_test_using_naming_service @@ -109,8 +111,9 @@ for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { - print "run_test <use_naming> or <use_files>\n"; + print "run_test [-chorus <target>] <use_naming> or <use_files>\n"; print "\n"; + print "-chorus <target> -- Run the test on the Chorus target\n"; print "use_naming -- Runs the test using Naming Service\n"; print "use_files -- Runs the test using IOR Files\n"; exit; @@ -127,7 +130,17 @@ for ($i = 0; $i <= $#ARGV; $i++) time_service_test_using_files (); last SWITCH; } - + 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); + } + last SWITCH; + } print "run_test: Unknown Option: ".$ARGV[$i]."\n"; } } diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 4df04410efb..2f22af42036 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -124,8 +124,16 @@ main (int argc, char** argv) ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n")); ACE_DEBUG ((LM_DEBUG, "*** Now serving dynamic properties.\n")); + size_t offset = 0; + char file[1024]; + ACE_OS::strcpy(file, argv[0]); + if ((offset = ACE_OS::strrchr(file, '/')) != 0) { + offset -= ((size_t)file - 1); + } + ACE_OS::strcpy(file + offset, "export_test_ready"); + FILE *ready_file = - ACE_OS::fopen ("export_test_ready", "w"); + ACE_OS::fopen (file, "w"); ACE_OS::fprintf (ready_file, "The export test is ready\n"); ACE_OS::fclose (ready_file); diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl index 44496390510..f8b27908e05 100755 --- a/TAO/orbsvcs/tests/Trading/run_test.pl +++ b/TAO/orbsvcs/tests/Trading/run_test.pl @@ -8,16 +8,31 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; require Process; +use Cwd; -$ior = "trading.ior"; -$ready_file = "export_test_ready"; +$cwd = getcwd(); +$ior = "$cwd$DIR_SEPARATOR" . "trading.ior"; +$ready_file = "$cwd$DIR_SEPARATOR" . "export_test_ready"; $sleeptime = 20; $status = 0; unlink $ior; unlink $ready_file; -$TS = Process::Create ("..".$DIR_SEPARATOR. +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); + } + } +} + +$TS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Trading_Service".$DIR_SEPARATOR. "Trading_Service".$EXE_EXT, diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index 30b5778cc58..3fc3f449141 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -7,24 +7,39 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$client_conf="muxed.conf"; +$cwd = getcwd(); +$client_conf="$cwd$DIR_SEPARATOR" . "muxed.conf"; $client_process="simple_client"; $debug_level='5'; $threads='2'; $iterations='1'; -foreach $i (@ARGV) { - if ($i eq '-mux') { +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); + } + } + elsif ($ARGV[$i] eq '-mux') { $client_conf = "muxed.conf"; - } elsif ($i eq '-debug') { + } + elsif ($ARGV[$i] eq '-debug') { $debug_level = '1'; - } elsif ($i eq '-exclusive') { + } + elsif ($ARGV[$i] eq '-exclusive') { $client_conf = 'exclusive.conf'; } } -$iorfile = "server.ior"; + +$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior"; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -ORBdebuglevel $debug_level" . "-d -o $iorfile"); diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl index 1ddc08714c3..45a624f538f 100755 --- a/TAO/tests/CDR/run_test.pl +++ b/TAO/tests/CDR/run_test.pl @@ -7,6 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../bin"; require ACEutils; +use Cwd; $brace="\#\#\#\#\#"; %tests = ("basic_types" => "-n 256 -l 10", @@ -16,9 +17,23 @@ $brace="\#\#\#\#\#"; "allocator" => ""); $test = ""; $args = ""; +$cwd = getcwd(); $| = 1; print STDERR "\n"; +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); + } + } +} + sub run_test { #my $test = shift (@tests); @@ -28,7 +43,7 @@ sub run_test $TST = Process::Create ($EXEPREFIX."$test".$EXE_EXT, "$args"); print STDERR "\t$test RUNNING\n"; - $retval = $TST->TimedWait (60); + $retval = $TST->TimedWait (90); if ($retval == -1) { print STDERR "ERROR $brace $test $args TIMEOUT\n"; $TST->Kill (); $TST->TimedWait (5); diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl index 289346ecc03..35ba3b40120 100755 --- a/TAO/tests/Connection_Purging/run_test.pl +++ b/TAO/tests/Connection_Purging/run_test.pl @@ -8,8 +8,24 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require Process; require ACEutils; +use Cwd; -$T = Process::Create ($EXEPREFIX."Connection_Purging -ORBCollocation no -d".$EXE_EXT); +$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); + } + } +} + +$T = Process::Create ($EXEPREFIX."Connection_Purging".$EXE_EXT, + "-ORBCollocation no -d"); $client = $T->TimedWait (60); if ($client == -1) { diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl index 7823a636e0d..d2000ddfadd 100755 --- a/TAO/tests/DSI_Gateway/run_test.pl +++ b/TAO/tests/DSI_Gateway/run_test.pl @@ -7,26 +7,41 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$svfile = "server.ior"; +$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); + } + } +} + +$svfile = "$cwd$DIR_SEPARATOR" . "server.ior"; unlink $svfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -o $svfile"); if (ACE::waitforfile_timed ($svfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; + print STDERR "ERROR: cannot find file <$svfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } -$gwfile = "gateway.ior"; +$gwfile = "$cwd$DIR_SEPARATOR" . "gateway.ior"; unlink $gwfile; $GW = Process::Create ($EXEPREFIX."gateway$EXE_EXT ", " -k file://$svfile" . " -o $gwfile"); if (ACE::waitforfile_timed ($gwfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; + print STDERR "ERROR: cannot find file <$gwfile>\n"; $GW->Kill (); $GW->TimedWait (1); exit 1; } diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl index a407b04ce1c..1751095d3f0 100755 --- a/TAO/tests/DynAny_Test/run_test.pl +++ b/TAO/tests/DynAny_Test/run_test.pl @@ -8,9 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../bin"; require ACEutils; require Process; +use Cwd; +$cwd = getcwd(); $type = ""; + sub run_test { my $type = shift(@_); @@ -35,11 +38,21 @@ for ($i = 0; $i <= $#ARGV; $i++) if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print "Run_Test Perl script for TAO DynAny Test\n\n"; - print "run_test [-t type]\n"; + print "run_test [-chorus <target>] [-t type]\n"; print "\n"; print "-t type -- runs only one type of dynany test\n"; exit; } + 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); + } + } if ($ARGV[$i] eq "-t") { $type = $ARGV[$i + 1]; diff --git a/TAO/tests/Endpoint_Per_Priority/run_test.pl b/TAO/tests/Endpoint_Per_Priority/run_test.pl index 3c0f036ed2d..8d39e46f3df 100755 --- a/TAO/tests/Endpoint_Per_Priority/run_test.pl +++ b/TAO/tests/Endpoint_Per_Priority/run_test.pl @@ -7,34 +7,51 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$client_conf="client.conf"; -$server_conf="server.conf"; +$cwd = getcwd(); +$client_conf="$cwd$DIR_SEPARATOR" . "client.conf"; +$server_conf="$cwd$DIR_SEPARATOR" . "server.conf"; $threads='2'; +$hostname = "localhost"; +$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior"; -$iorfile = "test.ior"; +for($i = 0; $i <= $#ARGV; $i++) { + if ($ARGV[$i] eq '-chorus') { + $i++; + if (defined $ARGV[$i]) { + $EXEPREFIX = "rsh $ARGV[$i] arun $cwd$DIR_SEPARATOR"; + $hostname = $ARGV[$i]; + } + else { + print STDERR "The -chorus option requires the hostname of the target\n"; + exit(1); + } + } +} print STDERR "================ Multi-threaded test\n"; unlink $iorfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -ORBEndPoint iiop://localhost:0/priority=0 " - . " -ORBEndPoint iiop://localhost:0/priority=1 " - . " -ORBEndPoint iiop://localhost:0/priority=2 " - . " -ORBEndPoint iiop://localhost:0/priority=3 " - . " -ORBEndPoint iiop://localhost:0/priority=4 " + " -ORBDebugLevel 5". + " -ORBSvcConf $server_conf" + . " -ORBEndPoint iiop://$hostname:0/priority=0 " + . " -ORBEndPoint iiop://$hostname:0/priority=1 " + . " -ORBEndPoint iiop://$hostname:0/priority=2 " + . " -ORBEndPoint iiop://$hostname:0/priority=3 " + . " -ORBEndPoint iiop://$hostname:0/priority=4 " . " -o $iorfile -n $threads"); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { +if (ACE::waitforfile_timed ($iorfile, 10) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; } $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " + " -ORBSvcConf $client_conf " . " -k file://$iorfile " . " -t 0 -t 1 -i 1000"); diff --git a/TAO/tests/Explicit_Event_Loop/run_test.pl b/TAO/tests/Explicit_Event_Loop/run_test.pl index 96fe0cd598b..3061c93707b 100755 --- a/TAO/tests/Explicit_Event_Loop/run_test.pl +++ b/TAO/tests/Explicit_Event_Loop/run_test.pl @@ -9,9 +9,24 @@ use lib "../../../bin"; require ACEutils; require Process; +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); + } + } +} $status = 0; -$iorfile = "chapter_test.ior"; +$iorfile = "$cwd$DIR_SEPARATOR" . "chapter_test.ior"; unlink $iorfile; diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl index 92d491fb9b7..3ad704f706f 100755 --- a/TAO/tests/Faults/run_test.pl +++ b/TAO/tests/Faults/run_test.pl @@ -7,12 +7,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$iorfile = "test.ior"; -$middlefile = "middle.ior"; -$dum_core = "core"; +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior"; +$middlefile = "$cwd$DIR_SEPARATOR" . "middle.ior"; +$dum_core = "$cwd$DIR_SEPARATOR" . "core"; $status = 0; +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); + } + } +} + print STDERR "===== Base test, no crashes\n"; unlink $iorfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl index 9d3d2d78ccd..fe8bb4f8dfb 100755 --- a/TAO/tests/IORManipulation/run_test.pl +++ b/TAO/tests/IORManipulation/run_test.pl @@ -8,6 +8,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require Process; require ACEutils; +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); + } + } +} + $T = Process::Create ($EXEPREFIX."IORTest".$EXE_EXT); diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl index 76af8c44aef..d0d76263225 100755 --- a/TAO/tests/InterOp-Naming/run_test.pl +++ b/TAO/tests/InterOp-Naming/run_test.pl @@ -8,20 +8,35 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require Process; require ACEutils; - -$file="test.ior"; - -$port = ACE::uniqueid () + 10000; +use Cwd; + +$cwd = getcwd(); +$file = "$cwd$DIR_SEPARATOR" . "test.ior"; +$port = ACE::uniqueid () + 10001; # This must be > 10000 for Chorus 4.0 +$hostname = "localhost"; + +for($i = 0; $i <= $#ARGV; $i++) { + if ($ARGV[$i] eq '-chorus') { + $i++; + if (defined $ARGV[$i]) { + $EXEPREFIX = "rsh $ARGV[$i] arun $cwd$DIR_SEPARATOR"; + $hostname = $ARGV[$i]; + } + else { + print STDERR "The -chorus option requires the hostname of the target\n"; + exit(1); + } + } +} print STDERR "\n\n==== InitRef test\n"; unlink $file; - $SV = Process::Create ($EXEPREFIX."INS_test_server".$EXE_EXT, - "-ORBEndpoint iiop://localhost:$port " + "-ORBEndpoint iiop://$hostname:$port " . " -i object_name -o $file"); -if (ACE::waitforfile_timed ($file, 3) == -1) { +if (ACE::waitforfile_timed ($file, 5) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; @@ -30,7 +45,7 @@ if (ACE::waitforfile_timed ($file, 3) == -1) { $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " random_service " ."-ORBInitRef random_service=" - ."iioploc://localhost:$port/object_name"); + ."iioploc://$hostname:$port/object_name"); $client = $CL->TimedWait (60); if ($client == -1) { @@ -46,7 +61,7 @@ print STDERR "\n\n==== InvalidName test\n"; $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " not_a_service " ."-ORBInitRef random_service=" - ."iioploc://localhost:$port/object_name"); + ."iioploc://$hostname:$port/object_name"); $client = $CL->TimedWait (60); if ($client == -1) { @@ -62,7 +77,7 @@ print STDERR "\n\n==== DefaultInitRef test\n"; $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " object_name " . "-ORBDefaultInitRef" - ." iioploc://localhost:$port"); + ." iioploc://$hostname:$port"); $client = $CL->TimedWait (60); if ($client == -1) { @@ -82,9 +97,9 @@ $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " random_service " . "-ORBInitRef random_service=" ."iioploc://" - ."localhost:$port1," - ."localhost:$port2," - ."localhost:$port" + ."$hostname:$port1," + ."$hostname:$port2," + ."$hostname:$port" ."/object_name"); $client = $CL->TimedWait (60); @@ -107,9 +122,9 @@ $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, . " -l " . "-ORBInitRef random_service=" . "iioploc://" - . "localhost:$port1," - . "localhost:$port2," - . "localhost:$port" + . "$hostname:$port1," + . "$hostname:$port2," + . "$hostname:$port" . "/object_name"); $client = $CL->TimedWait (60); @@ -127,9 +142,9 @@ $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " object_name " . "-ORBDefaultInitRef " ."iioploc://" - ."localhost:$port1," - ."localhost:$port2," - ."localhost:$port"); + ."$hostname:$port1," + ."$hostname:$port2," + ."$hostname:$port"); $client = $CL->TimedWait (60); if ($client == -1) { @@ -146,7 +161,7 @@ $CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT, " object_name " . "-ORBDefaultInitRef " ."iioploc://" - ."localhost:$port/"); + ."$hostname:$port/"); $client = $CL->TimedWait (60); if ($client == -1) { diff --git a/TAO/tests/Interceptors/client.cpp b/TAO/tests/Interceptors/client.cpp index 2ac1b788c46..3c5c1447797 100644 --- a/TAO/tests/Interceptors/client.cpp +++ b/TAO/tests/Interceptors/client.cpp @@ -13,7 +13,7 @@ PortableInterceptor::ClientRequestInterceptor_ptr interceptor = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "e"); + ACE_Get_Opt get_opts (argc, argv, "ef:"); int c; while ((c = get_opts ()) != -1) @@ -21,6 +21,9 @@ parse_args (int argc, char *argv[]) { case 'e': break; + case 'f': + ior = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Interceptors/run_test.pl b/TAO/tests/Interceptors/run_test.pl index 761e1ea81f5..3f83428fad3 100755 --- a/TAO/tests/Interceptors/run_test.pl +++ b/TAO/tests/Interceptors/run_test.pl @@ -8,10 +8,25 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require Process; require ACEutils; +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); + } + } +} print STDERR "\n\n==== Running interceptor test\n"; -$file="test.ior"; +$file = "$cwd$DIR_SEPARATOR" . "test.ior"; unlink $file; @@ -23,7 +38,8 @@ if (ACE::waitforfile_timed ($file, 15) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, "-ORBobjrefstyle url"); +$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, + "-ORBobjrefstyle url -f file://$file"); $client = $CL->TimedWait (60); diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl index ee4a5aac17b..95095cc49a7 100755 --- a/TAO/tests/Leader_Followers/run_test.pl +++ b/TAO/tests/Leader_Followers/run_test.pl @@ -7,15 +7,30 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; - -$iorfile = "ior"; +use Cwd; + +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "ior"; + +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); + } + } +} sub run_client { my $args = shift; $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - $args); + "-k file://$iorfile " . $args); $client = $CL->TimedWait (200); if ($client == -1) { @@ -84,7 +99,7 @@ unlink $iorfile; print STDERR "\n\n*** Single threaded server ***\n\n\n"; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -110,7 +125,9 @@ if ($server != 0 || $client != 0) { print STDERR "\n\n*** Thread-Pool server ***\n\n\n"; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", - "multi_threaded_event_loop.conf -e 5"); + " -o $iorfile -e 5" . + "$cwd$DIR_SEPARATOR" . + "multi_threaded_event_loop.conf"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl index 6d801a7cc9a..705c04c0c58 100755 --- a/TAO/tests/MT_Client/run_test.pl +++ b/TAO/tests/MT_Client/run_test.pl @@ -7,27 +7,40 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$client_conf="client.global.conf"; +$cwd = getcwd(); +$client_conf="$cwd$DIR_SEPARATOR" ."client.global.conf"; $client_process="client"; $debug_level='0'; $threads='10'; $status = 0; -foreach $i (@ARGV) { - if ($i eq '-tss') { - $client_conf = "client.tss.conf"; - } elsif ($i eq '-debug') { +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); + } + } + elsif ($ARGV[$i] eq '-tss') { + $client_conf = "$cwd$DIR_SEPARATOR" . "client.tss.conf"; + } elsif ($ARGV[$i] eq '-debug') { $debug_level = '1'; - } elsif ($i eq '-creation') { + } elsif ($ARGV[$i] eq '-creation') { $client_process = 'orb_creation'; $threads='2'; } } -$iorfile = "server.ior"; +$iorfile = "$cwd$DIR_SEPARATOR" ."server.ior"; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBsvcconf server.conf -ORBdebuglevel $debug_level" + " -ORBsvcconf " . "$cwd$DIR_SEPARATOR" ."server.conf ". + " -ORBdebuglevel $debug_level" . " -o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 30) == -1) { diff --git a/TAO/tests/MT_Server/run_test.pl b/TAO/tests/MT_Server/run_test.pl index 64a8cf58217..c00ef771592 100755 --- a/TAO/tests/MT_Server/run_test.pl +++ b/TAO/tests/MT_Server/run_test.pl @@ -7,12 +7,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; +$cwd = getcwd(); $threads='8'; +$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior"; + +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); + } + } +} -$iorfile = "test.ior"; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBsvcconf server.conf" + " -ORBsvcconf " . "$cwd$DIR_SEPARATOR" . "server.conf" . " -o $iorfile" . " -n $threads"); diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl index ca23c064b4e..04e84e018e2 100755 --- a/TAO/tests/Multiple_Inheritance/run_test.pl +++ b/TAO/tests/Multiple_Inheritance/run_test.pl @@ -7,8 +7,24 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; + +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior"; + +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); + } + } +} -$iorfile = "server.ior"; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $iorfile"); diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl index 13d3afa8cf0..dcccc80f7a2 100755 --- a/TAO/tests/Native_Exceptions/run_test.pl +++ b/TAO/tests/Native_Exceptions/run_test.pl @@ -7,11 +7,26 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$iorfile = "test.ior"; +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" ."test.ior"; unlink $iorfile; +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); + } + } +} + $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -o $iorfile"); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl index 48e71e1d4db..deb55a9f511 100755 --- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl @@ -8,9 +8,24 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +use Cwd; -$ior1file = "server1.ior"; -$ior2file = "server2.ior"; +$cwd = getcwd(); +$ior1file = "$cwd$DIR_SEPARATOR" . "server1.ior"; +$ior2file = "$cwd$DIR_SEPARATOR" . "server2.ior"; + +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); + } + } +} # Make sure the files are gone unlink $ior1file; diff --git a/TAO/tests/NestedUpcall/Simple/run_test.pl b/TAO/tests/NestedUpcall/Simple/run_test.pl index f9c6f05d900..4e59b0248e9 100755 --- a/TAO/tests/NestedUpcall/Simple/run_test.pl +++ b/TAO/tests/NestedUpcall/Simple/run_test.pl @@ -7,11 +7,26 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; +use Cwd; -$iorfile = "test.ior"; +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior"; unlink $iorfile; +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); + } + } +} + print STDERR "\nrunning ST version of the client and the server\n\n"; $SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index a50f480156c..4e25e20ebc3 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -8,9 +8,24 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +use Cwd; -$ior1file = "servera.ior"; -$ior2file = "serverb.ior"; +$cwd = getcwd(); +$ior1file = "$cwd$DIR_SEPARATOR" . "servera.ior"; +$ior2file = "$cwd$DIR_SEPARATOR" . "serverb.ior"; + +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); + } + } +} # Make sure these aren't hanging around unlink $ior1file; diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl index 0f0d7af78d8..ba226acd8b6 100755 --- a/TAO/tests/Nested_Event_Loop/run_test.pl +++ b/TAO/tests/Nested_Event_Loop/run_test.pl @@ -7,12 +7,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; - -$iorfile = "ior"; +use Cwd; + +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "ior"; + +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); + } + } +} unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -20,7 +35,8 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", "-x"); +$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", + "-k file://$iorfile -x"); $client = $CL->TimedWait (200); if ($client == -1) { diff --git a/TAO/tests/ORB_init/run_test.pl b/TAO/tests/ORB_init/run_test.pl index e2eeaf316b3..11ddb3fb203 100755 --- a/TAO/tests/ORB_init/run_test.pl +++ b/TAO/tests/ORB_init/run_test.pl @@ -7,6 +7,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +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); + } + } +} $orb_init = Process::Create ($EXEPREFIX."ORB_init$EXE_EXT "); diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl index 2064ee23cdb..a37a6d3336e 100755 --- a/TAO/tests/OctetSeq/run_test.pl +++ b/TAO/tests/OctetSeq/run_test.pl @@ -8,10 +8,25 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require Process; require ACEutils; +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); + } + } +} print STDERR "\n\n==== Octet sequence passing test\n"; -$file="test.ior"; +$file="$cwd$DIR_SEPARATOR" . "test.ior"; unlink $file; diff --git a/TAO/tests/POA/Deactivation/run_test.pl b/TAO/tests/POA/Deactivation/run_test.pl index 4e96e5f2230..6a02665cb74 100755 --- a/TAO/tests/POA/Deactivation/run_test.pl +++ b/TAO/tests/POA/Deactivation/run_test.pl @@ -8,6 +8,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +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); + } + } +} $T = Process::Create ($EXEPREFIX."Deactivation".$EXE_EXT); diff --git a/TAO/tests/POA/Destruction/run_test.pl b/TAO/tests/POA/Destruction/run_test.pl index 6f2424b2053..bb2b1c3531f 100755 --- a/TAO/tests/POA/Destruction/run_test.pl +++ b/TAO/tests/POA/Destruction/run_test.pl @@ -8,6 +8,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +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); + } + } +} $T = Process::Create ($EXEPREFIX."Destruction".$EXE_EXT); diff --git a/TAO/tests/POA/Identity/run_test.pl b/TAO/tests/POA/Identity/run_test.pl index bf77e2157cf..cf540e26f51 100755 --- a/TAO/tests/POA/Identity/run_test.pl +++ b/TAO/tests/POA/Identity/run_test.pl @@ -8,6 +8,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require Process; require ACEutils; +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); + } + } +} $T = Process::Create ($EXEPREFIX."Identity".$EXE_EXT); diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl index b534c1f0101..0fe3503c85f 100755 --- a/TAO/tests/Param_Test/run_test.pl +++ b/TAO/tests/Param_Test/run_test.pl @@ -5,11 +5,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- + + use lib "../../../bin"; require ACEutils; require Process; +use Cwd; -$iorfile = "server.ior"; +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior"; $invocation = "sii"; $num = 5; $other = ""; @@ -76,7 +80,7 @@ for ($i = 0; $i <= $#ARGV; $i++) if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print "Run_Test Perl script for TAO Param Test\n\n"; - print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)]\n"; + print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n"; print "\n"; print "-n num -- runs the client num times\n"; print "-d -- runs each in debug mode\n"; @@ -84,8 +88,20 @@ for ($i = 0; $i <= $#ARGV; $i++) print "-h -- prints this information\n"; print "-t type -- runs only one type of param test\n"; print "-i (dii|sii) -- Changes the type of invocation\n"; + print "-chorus <target> -- Run tests on chorus target\n"; exit 0; } + 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); + } + last SWITCH; + } if ($ARGV[$i] eq "-n") { $num = $ARGV[$i + 1]; diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl index 19b627de397..754498ea487 100755 --- a/TAO/tests/Smart_Proxies/run_test.pl +++ b/TAO/tests/Smart_Proxies/run_test.pl @@ -7,8 +7,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; - -$iorfile = "test.ior"; +use Cwd; + +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior"; + +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); + } + } +} unlink $iorfile; @@ -23,7 +38,8 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT "); +$CL = Process::Create ($EXEPREFIX."client$EXE_EXT", + "-i file://$iorfile"); $client = $CL->TimedWait (60); if ($client == -1) { diff --git a/TAO/tests/Timed_Buffered_Oneways/run_test.pl b/TAO/tests/Timed_Buffered_Oneways/run_test.pl index 0f0d7af78d8..b33ced012d6 100755 --- a/TAO/tests/Timed_Buffered_Oneways/run_test.pl +++ b/TAO/tests/Timed_Buffered_Oneways/run_test.pl @@ -7,12 +7,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; -$iorfile = "ior"; +$cwd = getcwd(); +$iorfile = "$cwd$DIR_SEPARATOR" . "ior"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); +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); + } + } +} + +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -20,7 +35,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", "-x"); +$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", "-k file://$iorfile -x"); $client = $CL->TimedWait (200); if ($client == -1) { diff --git a/TAO/tests/Timeout/run_test.pl b/TAO/tests/Timeout/run_test.pl index c8e485e77d6..f1d48dca55f 100755 --- a/TAO/tests/Timeout/run_test.pl +++ b/TAO/tests/Timeout/run_test.pl @@ -7,12 +7,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../bin'; require ACEutils; +use Cwd; +$cwd = getcwd(); $status = 0; -$iorfile = "server.ior"; +$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior"; unlink $iorfile; +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); + } + } +} + $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -o $iorfile"); |