diff options
41 files changed, 197 insertions, 157 deletions
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl index 70f9c45c46c..ad17a70c16d 100755 --- a/TAO/examples/POA/Adapter_Activator/run_test.pl +++ b/TAO/examples/POA/Adapter_Activator/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl index 31c59d91d94..f81e9b9c09a 100755 --- a/TAO/examples/POA/DSI/run_test.pl +++ b/TAO/examples/POA/DSI/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl index bb50518dae3..e391e365f5e 100755 --- a/TAO/examples/POA/Default_Servant/run_test.pl +++ b/TAO/examples/POA/Default_Servant/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl index 70f9c45c46c..ad17a70c16d 100755 --- a/TAO/examples/POA/Explicit_Activation/run_test.pl +++ b/TAO/examples/POA/Explicit_Activation/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl index 931304a076c..38a074d6601 100755 --- a/TAO/examples/POA/FindPOA/run_test.pl +++ b/TAO/examples/POA/FindPOA/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl index 2a0f62b2d73..92b58c93cb7 100755 --- a/TAO/examples/POA/Forwarding/run_test.pl +++ b/TAO/examples/POA/Forwarding/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; @@ -15,28 +16,28 @@ $brace="\#\#\#\#\#"; # Servers 1 and 2 are used in all tests @server1arglist = ("-o server1 -ORBport 10040 -ORBobjrefstyle url", - "-p server1 -ORBport 10040 -ORBobjrefstyle url", - "-o server1 -ORBport 10040 -ORBobjrefstyle url"); + "-p server1 -ORBport 10040 -ORBobjrefstyle url", + "-o server1 -ORBport 10040 -ORBobjrefstyle url"); @server2arglist = ("-f server1 -o server2 -ORBport 10041 -ORBobjrefstyle url", - "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url", - "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url"); + "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url", + "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url"); # The third server is only needed for the last test, but I'm making it # a list in case anyone wants to run it in multiple tests, rather than # just one @server3arglist = ("", - "", - "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url"); + "", + "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url"); # The client is run for all tests @clientarglist = ("-f server2 -i 5", - "-g server2 -i 5", - "-f server3 -i 8"); + "-g server2 -i 5", + "-f server3 -i 8"); # Descriptions of the tests @testlist = ("POA approach", - "servant locator approach", - "dual POA and servant locator approaches"); + "servant locator approach", + "dual POA and servant locator approaches"); $testtype = ""; @@ -75,19 +76,19 @@ sub run_test # Run the servers $SRV1 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, - "$server1args"); + "$server1args"); print STDERR ("server $server1args\n"); ACE::waitforfile ("server1"); $SRV2 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, - "$server2args"); + "$server2args"); print STDERR ("server $server2args\n"); ACE::waitforfile ("server2"); if ($server3args ne "") { - $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, - "$server3args"); + $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, + "$server3args"); ACE::waitforfile ("server3"); } @@ -102,17 +103,17 @@ sub run_test if ($server3args ne "") { - $SRV3->Kill (); $SRV3->Wait (); + $SRV3->Kill (); $SRV3->Wait (); } if ($status != 0) { - print STDERR ("\n$brace Test of $testtype FAILED\n"); - $retval = -1; + print STDERR ("\n$brace Test of $testtype FAILED\n"); + $retval = -1; } else { - print STDERR ("\n$brace Test of $testtype SUCCEEDED\n"); + print STDERR ("\n$brace Test of $testtype SUCCEEDED\n"); } cleanup_ior (); return $status; @@ -125,7 +126,7 @@ for ($q = 0; $q < 3; $q++) run_test (); if ($q < 2) { - print STDERR ("\n\t\t Waiting for things to stabilize...\n"); - sleep ($ACE::sleeptime); + print STDERR ("\n\t\t Waiting for things to stabilize...\n"); + sleep ($ACE::sleeptime); } } diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl index b9b054c9fa4..4961df7a72e 100755 --- a/TAO/examples/POA/Loader/run_test.pl +++ b/TAO/examples/POA/Loader/run_test.pl @@ -2,8 +2,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -#$Id$ +# $Id$ # -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl index e89d7d4e29b..58004c58b48 100755 --- a/TAO/examples/POA/NewPOA/run_test.pl +++ b/TAO/examples/POA/NewPOA/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl index 4c94fe6590d..4961df7a72e 100755 --- a/TAO/examples/POA/On_Demand_Activation/run_test.pl +++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl index c902f9e081a..4961df7a72e 100755 --- a/TAO/examples/POA/On_Demand_Loading/run_test.pl +++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl @@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -#$Id$ +# $Id$ # -*- perl -*- unshift @INC, '../../../../bin'; diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl index d777daaa6a9..92d71a06ebd 100755 --- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl +++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl index 42d1be9df40..681f6768bb6 100755 --- a/TAO/examples/Quoter/run_test.pl +++ b/TAO/examples/Quoter/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + # This is a Perl script that runs the client and all the other servers that # are needed. @@ -70,7 +71,7 @@ sub lifecycle_server my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR". "LifeCycle_Service$DIR_SEPARATOR". "LifeCycle_Service$Process::EXE_EXT"; - + $LC = Process::Create ($prog, $args); } diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl index 04bed456d85..7fcb67ec476 100755 --- a/TAO/examples/Simple/bank/run_test.pl +++ b/TAO/examples/Simple/bank/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; require Process; diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl index 82ef2b5e244..bc8a10e0fe3 100755 --- a/TAO/examples/Simple/echo/run_test.pl +++ b/TAO/examples/Simple/echo/run_test.pl @@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -#$Id$ +# $Id$ # -*- perl -*- use lib "../../../../bin"; diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl index 63c0bee9564..7c1e18a1afc 100755 --- a/TAO/examples/Simple/grid/run_test.pl +++ b/TAO/examples/Simple/grid/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; require Process; diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl index 63c0bee9564..7c1e18a1afc 100755 --- a/TAO/examples/Simple/time-date/run_test.pl +++ b/TAO/examples/Simple/time-date/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; require Process; diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl index aa418952d2e..855a403c494 100755 --- a/TAO/examples/Simple/time/run_test.pl +++ b/TAO/examples/Simple/time/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require ACEutils; require Process; diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl index 63a6701aa35..cfc7baacc2c 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl index a748182fe12..1e9f2e36c40 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl index 50a65b5d6e3..f0b88f24d2c 100755 --- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl @@ -1,9 +1,10 @@ -# -*- perl -*- -# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + $status = system ($EXEPREFIX."EC_Basic".$Process::EXE_EXT, ""); # @@ Capture any errors from the server too. diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index 130dcd43ac0..abee5c67c57 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index df3183f0c3f..6a80cf9cf88 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; @@ -11,13 +12,13 @@ $NS_ior = "NameService.ior"; $sleeptime = 3; $NS = Process::Create ("../../Naming_Service/Naming_Service". - $Process::EXE_EXT." -o $NS_ior "); + $Process::EXE_EXT." -o $NS_ior "); sleep $sleeptime; # This is a very simple test, no multiple consumers and no gateways. $status = system ($EXEPREFIX."EC_Multiple".$Process::EXE_EXT. - " -s local"); + " -s local"); $NS->Kill (); diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index cfb17420485..b5e952dd4d8 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; @@ -11,15 +12,15 @@ $NS_ior = "NameService.ior"; $sleeptime = 5; $NS = Process::Create ("..".$DIR_SEPARATOR. - "..".$DIR_SEPARATOR. - "Naming_Service".$DIR_SEPARATOR. - "Naming_Service".$Process::EXE_EXT. - " -o $NS_ior "); + "..".$DIR_SEPARATOR. + "Naming_Service".$DIR_SEPARATOR. + "Naming_Service".$Process::EXE_EXT. + " -o $NS_ior "); sleep $sleeptime; $T = Process::Create ($EXEPREFIX."ECT_Throughput".$Process::EXE_EXT - . " -ORBsvcconf ec.conf -m new -n 1000 "); + . " -ORBsvcconf ec.conf -m new -n 1000 "); sleep $sleeptime; diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl index 1c0506f887c..0004b4229f5 100755 --- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl +++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; @@ -11,7 +12,7 @@ $NS_ior = "NameService.ior"; $sleeptime = 3; $NS = Process::Create ("../../Naming_Service/Naming_Service". - $Process::EXE_EXT." -o $NS_ior "); + $Process::EXE_EXT." -o $NS_ior "); sleep $sleeptime; @@ -20,7 +21,7 @@ $ES = Process::Create ("../../Event_Service/Event_Service".$Process::EXE_EXT); sleep $sleeptime; $status = system ($EXEPREFIX."Event_Latency".$Process::EXE_EXT. - " -j -m 100"); + " -j -m 100"); $NS->Kill (); $ES->Kill (); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index a5513b9f312..b37cd2b6179 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; @@ -35,7 +36,7 @@ sub airplane_test sub airplane_ir_test { - $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0"); ACE::waitforfile ($implrepo_ior); @@ -67,7 +68,7 @@ sub nestea_test sub nestea_ir_test { - $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0"); ACE::waitforfile ($implrepo_ior); @@ -84,7 +85,7 @@ sub nestea_ir_test sub both_ir_test { - $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0"); ACE::waitforfile ($implrepo_ior); @@ -125,27 +126,27 @@ for ($i = 0; $i <= $#ARGV; $i++) } if ($ARGV[$i] eq "airplane") { - airplane_test (); + airplane_test (); exit; } if ($ARGV[$i] eq "airplane_ir") { - airplane_ir_test (); + airplane_ir_test (); exit; } if ($ARGV[$i] eq "nestea") { - nestea_test (); + nestea_test (); exit; } if ($ARGV[$i] eq "nestea_ir") { - nestea_ir_test (); + nestea_ir_test (); exit; } if ($ARGV[$i] eq "both_ir") { - both_ir_test (); + both_ir_test (); exit; } diff --git a/TAO/orbsvcs/tests/Logger/run_test.pl b/TAO/orbsvcs/tests/Logger/run_test.pl index bbacd0be9ee..bf052ebdb58 100755 --- a/TAO/orbsvcs/tests/Logger/run_test.pl +++ b/TAO/orbsvcs/tests/Logger/run_test.pl @@ -1,8 +1,10 @@ -# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + $tao_root = $ENV{TAO_ROOT}; # This is a Perl script that runs the Logger client and server @@ -17,7 +19,7 @@ sub service { my $args = ""; my $prog = $EXEPREFIX."$tao_root/orbsvcs/Logging_Service/Logging_Service" - .$Process::EXE_EXT; + .$Process::EXE_EXT; $SV = Process::Create ($prog, $args); } @@ -26,7 +28,7 @@ sub test { my $args = ""; my $prog = $EXEPREFIX."Logging_Test".$Process::EXE_EXT; - + system ("$prog $args"); } diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index 50292c6c72a..c287ed68236 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + $tao_root = $ENV{TAO_ROOT}; # This is a Perl script that runs the Naming Service, client and servers @@ -22,7 +23,7 @@ sub name_server { my $args = "-ORBnameserviceport $nsport"; my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service" - .$Process::EXE_EXT; + .$Process::EXE_EXT; print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n"); $NS = Process::Create ($prog, $args); } diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index e837dfcf91c..1068b4866cd 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + # This is a Perl script that runs the client and all the other servers that # are needed @@ -40,10 +41,10 @@ sub client @opts = ("-s", "-t", "-i", "-e", "-y"); @comments = ("Simple Test: \n", - "Tree Test: \n", - "Iterator Test: \n", - "Exceptions Test: \n", - "Destroy Test: \n"); + "Tree Test: \n", + "Iterator Test: \n", + "Exceptions Test: \n", + "Destroy Test: \n"); $test_number = 0; diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl index 7a0138e8b4f..6e7183b63f9 100755 --- a/TAO/orbsvcs/tests/Time/run_test.pl +++ b/TAO/orbsvcs/tests/Time/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../../bin"; require ACEutils; @@ -31,7 +32,7 @@ sub time_service_test_using_naming_service sleep 10; $status = system ($EXEPREFIX."client".$Process::EXE_EXT. - ""); + ""); $SV1->Kill (); $SV2->Kill (); @@ -42,20 +43,20 @@ sub time_service_test_using_naming_service sub time_service_test_using_files { $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT, - "-o $server_ior"); + "-o $server_ior"); ACE::waitforfile ($server_ior); sleep 5; $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT, - "-f $server_ior -o clerk_ior -t 2"); + "-f $server_ior -o clerk_ior -t 2"); ACE::waitforfile ($clerk_ior); sleep 10; $status = system ($EXEPREFIX."client".$Process::EXE_EXT. - " -f clerk_ior"); + " -f clerk_ior"); $SV1->Kill (); $SV2->Kill (); @@ -69,7 +70,7 @@ sub time_service_test_using_files sub time_service_test_using_ir { $ir_dir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR; - $IR = Process::Create ($ir_dir."ImplRepo_Service".$Process::EXE_EXT, + $IR = Process::Create ($ir_dir."ImplRepo_Service".$Process::EXE_EXT, "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 1"); ACE::waitforfile ($implrepo_ior); @@ -82,7 +83,7 @@ sub time_service_test_using_ir sleep 10; $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT, - "-f $server_ior -o clerk_ior -ORBobjrefstyle url"); + "-f $server_ior -o clerk_ior -ORBobjrefstyle url"); sleep 10; diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl index bb1241bfd7e..850b05d6503 100755 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../../bin'; require Process; @@ -13,17 +14,17 @@ $iorfile = "theior"; $sleeptime = 5; $SV = Process::Create ("..$DIR_SEPARATOR" - ."IDL_Cubit".$DIR_SEPARATOR. - "server".$Process::EXE_EXT, + ."IDL_Cubit".$DIR_SEPARATOR. + "server".$Process::EXE_EXT, " -ORBport ".$server_port. - " -ORBobjrefstyle url". - " -o $iorfile"); + " -ORBobjrefstyle url". + " -o $iorfile"); sleep $sleeptime; $status = system ("client".$Process::EXE_EXT. - " -ORBport $client_port". - " -f $iorfile -x"); + " -ORBport $client_port". + " -f $iorfile -x"); # @@ TODO change to Wait() once the -x option works. $SV->Kill (); $SV->Wait (); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl index d4c3ed60e2d..5bf3b72a8b6 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl @@ -3,6 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' if 0; # $Id$ +# -*- perl -*- # The first three lines above let this script run without specifying the # full path to perl, as long as it is in the user's PATH. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl index 1a045cf6c03..2e0c01f8db4 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + $usage = "run_tests.pl [-l suppress -ORBgioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n"; unshift @INC, '../../../../../bin'; diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl index 8d7b776e395..0eb511921eb 100755 --- a/TAO/tests/CDR/run_test.pl +++ b/TAO/tests/CDR/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../bin"; require ACEutils; @@ -16,19 +17,19 @@ $args = ""; $| = 1; print STDERR "\n"; -sub run_test +sub run_test { #my $test = shift (@tests); my $args = shift (@argslist); - + print STDERR "\n$brace $test $args test BEGUN\n"; $TST = Process::Create ($EXEPREFIX."$test".$Process::EXE_EXT, - "$args"); + "$args"); print STDERR "\t$test RUNNING\n"; - $retval = ($TST->Wait ()) / 256; + $retval = ($TST->Wait ()) / 256; if (retval != 0) { - print STDERR "$brace $test $args FAILED; exited with value $retval\n"; + print STDERR "$brace $test $args FAILED; exited with value $retval\n"; } print STDERR "$brace $test ENDED successfully\n"; } diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl index d16d5907fe5..ae22a39216a 100755 --- a/TAO/tests/DynAny_Test/run_test.pl +++ b/TAO/tests/DynAny_Test/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../bin"; require ACEutils; diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl index 9d64892ac94..659f8671712 100755 --- a/TAO/tests/MT_Client/run_test.pl +++ b/TAO/tests/MT_Client/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../bin'; require ACEutils; @@ -25,15 +26,15 @@ foreach $i (@ARGV) { $iorfile = "server.ior"; $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT ", - " -ORBsvcconf server.conf -ORBdebuglevel $debug_level" - . " -o $iorfile"); + " -ORBsvcconf server.conf -ORBdebuglevel $debug_level" + . " -o $iorfile"); ACE::waitforfile ($iorfile); $status = system ($EXEPREFIX."$client_process$Process::EXE_EXT " - . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level" - . " -k file://$iorfile " - . " -n $threads -i 1000"); + . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level" + . " -k file://$iorfile " + . " -n $threads -i 1000"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl index abaeff69391..a5533c0989c 100755 --- a/TAO/tests/Multiple_Inheritance/run_test.pl +++ b/TAO/tests/Multiple_Inheritance/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../bin'; require ACEutils; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl index da9f7ca749a..3a17e045cfd 100755 --- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; require ACEutils; @@ -17,20 +18,20 @@ $ior2file = "server2.ior"; unlink $ior1file; unlink $ior2file; -$SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, " -ORBport $server1_port -o $ior1file ". - " -ORBobjrefstyle url"); + " -ORBobjrefstyle url"); -$SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, " -ORBport $server2_port -o $ior2file ". - " -ORBobjrefstyle url"); + " -ORBobjrefstyle url"); ACE::waitforfile ($ior1file); ACE::waitforfile ($ior2file); $status = system ($EXEPREFIX."client".$Process::EXE_EXT. - " -ORBport $client_port ". - " -f $ior1file -g $ior2file -n 2 -i 10 -s 5"); + " -ORBport $client_port ". + " -f $ior1file -g $ior2file -n 2 -i 10 -s 5"); $SV1->Kill (); $SV1->Wait (); $SV2->Kill (); $SV2->Wait (); diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl index 4dda2cc2e11..e86eee20278 100755 --- a/TAO/tests/NestedUpcall/Reactor/run_test.pl +++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl @@ -1,20 +1,21 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; require ACEutils; -$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, - " -ORBobjrefstyle url"); +$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, + " -ORBobjrefstyle url"); sleep ($ACE::sleeptime); $status = system ($EXEPREFIX."client".$Process::EXE_EXT. - " -x "); + " -x "); $SV->Wait (); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index c0dcaba5cbf..eb49798ddd0 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../../bin'; require Process; require ACEutils; @@ -15,17 +16,17 @@ $ior2file = "serverb.ior"; unlink $ior1file; unlink $ior2file; -$SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT, +$SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT, "-o $ior1file -ORBobjrefstyle url"); -$SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT, +$SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT, "-o $ior2file -ORBobjrefstyle url"); ACE::waitforfile ($ior1file); ACE::waitforfile ($ior2file); $status = system ($EXEPREFIX."initiator".$Process::EXE_EXT. - " -f $ior1file -g $ior2file"); + " -f $ior1file -g $ior2file"); $SV1->Kill (); $SV1->Wait (); $SV2->Kill (); $SV2->Wait (); diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl index bf18b76c615..6fb4491e4b2 100755 --- a/TAO/tests/OctetSeq/run_test.pl +++ b/TAO/tests/OctetSeq/run_test.pl @@ -1,9 +1,10 @@ -#$Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + unshift @INC, '../../../bin'; require ACEutils; diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl index 4aaf42d658e..f11e064b6ba 100755 --- a/TAO/tests/Param_Test/run_test.pl +++ b/TAO/tests/Param_Test/run_test.pl @@ -1,9 +1,10 @@ -# $Id$ -# -*- perl -*- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; +# $Id$ +# -*- perl -*- + use lib "../../../bin"; require ACEutils; require Process; @@ -23,7 +24,7 @@ sub run_test $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, "$debug -ORBport $port -o ". $iorfile); - + ACE::waitforfile ($iorfile); system ($EXEPREFIX."client $debug -f $iorfile -i $invocation -t ". @@ -103,7 +104,7 @@ for ($i = 0; $i <= $#ARGV; $i++) "ub_short_sequence", "ub_long_sequence", "bd_short_sequence", "bd_long_sequence", "fixed_array", "var_array", "typecode", "exception", - "big_union"); + "big_union"); if ($type ne "") { |