diff options
Diffstat (limited to 'TAO')
49 files changed, 203 insertions, 183 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 0058f9c8dd7..77d7fb1eda6 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Thu Jun 17 10:05:53 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * */run_test.pl: + Fixed several problems with the EXE_EXT variable. + Thu Jun 17 00:47:30 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu> * TAO_IDL/ast/ast_decl.cpp: diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl index d08919e7e18..3e4ac9098be 100755 --- a/TAO/examples/Callback_Quoter/run_test.pl +++ b/TAO/examples/Callback_Quoter/run_test.pl @@ -18,7 +18,7 @@ $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "orbsvcs".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. - "Naming_Service".$Process::EXE_EXT, + "Naming_Service".$EXE_EXT, " -o $ns_ior "); if (ACE::waitforfile_timed ($ns_ior, 5) == -1) { diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl index ab75bdeaaee..e32984f14e0 100755 --- a/TAO/examples/POA/Adapter_Activator/run_test.pl +++ b/TAO/examples/POA/Adapter_Activator/run_test.pl @@ -59,7 +59,7 @@ unlink $iorfile_1; unlink $iorfile_2; unlink $iorfile_3; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -78,11 +78,11 @@ if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) { exit 1; } -$CL_1 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_1"); -$CL_2 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_2"); -$CL_3 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_3 -x"); diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl index c914fa21047..e0fae9a8394 100755 --- a/TAO/examples/POA/DSI/run_test.pl +++ b/TAO/examples/POA/DSI/run_test.pl @@ -12,7 +12,7 @@ $iorfile = "server.ior"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", " -f $iorfile"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -20,7 +20,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT ", +$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", " -f $iorfile -x"); $client = $CL->TimedWait (60); diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl index 129744c1a63..c303370d131 100755 --- a/TAO/examples/POA/Default_Servant/run_test.pl +++ b/TAO/examples/POA/Default_Servant/run_test.pl @@ -12,7 +12,7 @@ $iorfile = "server.ior"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, " -o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { @@ -21,7 +21,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT ", +$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", " -k $iorfile"); $client = $CL->TimedWait (60); diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl index 7006effaafc..4036059e83f 100755 --- a/TAO/examples/POA/Explicit_Activation/run_test.pl +++ b/TAO/examples/POA/Explicit_Activation/run_test.pl @@ -60,7 +60,7 @@ unlink $iorfile_2; unlink $iorfile_3; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; @@ -80,11 +80,11 @@ if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) { exit 1; } -$CL_1 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_1"); -$CL_2 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_2"); -$CL_3 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_3 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_3 -x"); diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl index ee0c863b9a6..431a4597054 100755 --- a/TAO/examples/POA/FindPOA/run_test.pl +++ b/TAO/examples/POA/FindPOA/run_test.pl @@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; -$TEST = Process::Create ($EXEPREFIX."FindPOA$Process::EXE_EXT",""); +$TEST = Process::Create ($EXEPREFIX."FindPOA$EXE_EXT",""); if ($TEST->TimedWait (60) == -1){ print STDERR "ERROR: test timedout\n"; diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl index 5ba649c1316..afb11d01a92 100755 --- a/TAO/examples/POA/Forwarding/run_test.pl +++ b/TAO/examples/POA/Forwarding/run_test.pl @@ -78,7 +78,7 @@ sub run_test cleanup_ior (); # Run the servers - $SRV1 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, + $SRV1 = Process::Create (".".$DIR_SEPARATOR."server".$EXE_EXT, "$server1args"); print STDERR ("server $server1args\n"); @@ -88,7 +88,7 @@ sub run_test exit 1; } - $SRV2 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, + $SRV2 = Process::Create (".".$DIR_SEPARATOR."server".$EXE_EXT, "$server2args"); print STDERR ("server $server2args\n"); @@ -100,7 +100,7 @@ sub run_test } if ($server3args ne "") { - $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT, + $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$EXE_EXT, "$server3args"); if (ACE::waitforfile_timed ("server3", 5) == -1) { @@ -113,7 +113,7 @@ sub run_test } # Run the client and block until completion - $CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT, + $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, " $clientargs"); print STDERR ("client $clientargs\n"); diff --git a/TAO/examples/POA/Identity/run_test.pl b/TAO/examples/POA/Identity/run_test.pl index e79020ce66c..b25cf4a7ff4 100755 --- a/TAO/examples/POA/Identity/run_test.pl +++ b/TAO/examples/POA/Identity/run_test.pl @@ -9,7 +9,7 @@ unshift @INC, '../../../bin'; require Process; require ACEutils; -$T = Process::Create ($EXEPREFIX."Identity"); +$T = Process::Create ($EXEPREFIX."Identity".$EXE_EXT); $client = $T->TimedWait (60); if ($client == -1) { diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl index b901c6a8344..29e7c37c12c 100755 --- a/TAO/examples/POA/Loader/run_test.pl +++ b/TAO/examples/POA/Loader/run_test.pl @@ -57,7 +57,7 @@ $iorfile_2 = $iorfile."_2"; unlink $iorfile_1; unlink $iorfile_2; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; @@ -72,9 +72,9 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) { } -$CL_1 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_1"); -$CL_2 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_2 -x"); diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl index a40bd3ec88a..ab550847c8d 100755 --- a/TAO/examples/POA/NewPOA/run_test.pl +++ b/TAO/examples/POA/NewPOA/run_test.pl @@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' unshift @INC, '../../../../bin'; require ACEutils; -$TEST = Process::Create ($EXEPREFIX."NewPOA$Process::EXE_EXT", ""); +$TEST = Process::Create ($EXEPREFIX."NewPOA$EXE_EXT", ""); if ($TEST->TimedWait (60) == -1) { print STDERR "ERROR: test timedout\n"; $TEST->Kill (); $TEST->TimedWait (1); diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl index 6a84c82e153..b0f60b06aae 100755 --- a/TAO/examples/POA/On_Demand_Activation/run_test.pl +++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl @@ -57,7 +57,7 @@ $iorfile_2 = $iorfile."_2"; unlink $iorfile_1; unlink $iorfile_2; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; @@ -71,9 +71,9 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) { exit 1; } -$CL_1 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ", "$extra_args $oneway -i $iterations -f $iorfile_1"); -$CL_2 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ", "$extra_args $oneway -i $iterations -f $iorfile_2 -x"); diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl index 08f9d16e7b7..a16a69cc5c1 100755 --- a/TAO/examples/POA/On_Demand_Loading/run_test.pl +++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl @@ -57,7 +57,7 @@ $iorfile_2 = $iorfile."_2"; unlink $iorfile_1; unlink $iorfile_2; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile_1>\n"; @@ -73,9 +73,9 @@ if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) { -$CL_1 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_1 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_1"); -$CL_2 = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL_2 = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile_2 -x"); $client_1 = $CL_1->TimedWait (60); diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl index 15ff238f4c9..d8a11cac826 100755 --- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl +++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl @@ -53,7 +53,7 @@ for ($i = 0; $i <= $#ARGV; $i++) unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; @@ -61,7 +61,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ", +$CL = Process::Create ("../Generic_Servant/client$EXE_EXT ", " $extra_args $oneway -i $iterations -f $iorfile -x"); $client = $CL->TimedWait (60); diff --git a/TAO/examples/POA/RootPOA/run_test.pl b/TAO/examples/POA/RootPOA/run_test.pl index f64877afb04..487efdd670e 100755 --- a/TAO/examples/POA/RootPOA/run_test.pl +++ b/TAO/examples/POA/RootPOA/run_test.pl @@ -9,7 +9,7 @@ unshift @INC, '../../../bin'; require Process; require ACEutils; -$T = Process::Create ($EXEPREFIX."RootPOA"); +$T = Process::Create ($EXEPREFIX."RootPOA".$EXE_EXT); $client = $T->TimedWait (60); if ($client == -1) { diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl index 69d5f6bcb4c..3e32f8942f7 100755 --- a/TAO/examples/POA/TIE/run_test.pl +++ b/TAO/examples/POA/TIE/run_test.pl @@ -24,7 +24,7 @@ unlink $iorfile_4; unlink $iorfile_5; unlink $iorfile_6; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); # In this example all the files are written out at the same time. So make a # check only for the first file @@ -35,10 +35,10 @@ if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) { } ACE::waitforfile ($iorfile_1); -$status = Process::Create ($EXEPREFIX."client$Process::EXE_EXT -a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4"); +$status = Process::Create ($EXEPREFIX."client$EXE_EXT -a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4"); if (ACE::waitforfile_timed ($iorfile_5,1) == 0) { -$status = Process::Create ($EXEPREFIX."client$Process::EXE_EXT -e file://$iorfile_5 -f file://$iorfile_6"); +$status = Process::Create ($EXEPREFIX."client$EXE_EXT -e file://$iorfile_5 -f file://$iorfile_6"); } unlink $iorfile_1; diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl index 2bdfdd0d488..e4f26e66b5f 100755 --- a/TAO/examples/Quoter/run_test.pl +++ b/TAO/examples/Quoter/run_test.pl @@ -48,7 +48,7 @@ sub name_server my $args = "$other -o $nsiorfile"; my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR". "Naming_Service$DIR_SEPARATOR". - "Naming_Service$Process::EXE_EXT"; + "Naming_Service$EXE_EXT"; $NS = Process::Create ($prog, $args); } @@ -59,7 +59,7 @@ sub lifecycle_server "$ior -ORBsvcconf svc.conf"; my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR". "LifeCycle_Service$DIR_SEPARATOR". - "LifeCycle_Service$Process::EXE_EXT"; + "LifeCycle_Service$EXE_EXT"; $LC = Process::Create ($prog, $args); } @@ -69,7 +69,7 @@ sub server my $args = "$other $debug $sm ". "-ORBnameserviceior $ior -ORBsvcconf $s_conf"; - $SV = Process::Create ("server$Process::EXE_EXT", $args); + $SV = Process::Create ("server$EXE_EXT", $args); } sub factory_finder @@ -77,7 +77,7 @@ sub factory_finder my $args = "$other -ORBnameserviceior ". "$ior -ORBsvcconf svc.conf"; - $FF = Process::Create ("Factory_Finder".$Process::EXE_EXT, $args); + $FF = Process::Create ("Factory_Finder".$EXE_EXT, $args); } sub generic_factory @@ -85,12 +85,12 @@ sub generic_factory my $args = "$other -l -ORBnameserviceior ". "$ior -ORBsvcconf svc.conf"; - $GF = Process::Create ("Generic_Factory".$Process::EXE_EXT, $args); + $GF = Process::Create ("Generic_Factory".$EXE_EXT, $args); } sub client { - my $exe = "client$Process::EXE_EXT $other -l $debug $cm ". + my $exe = $EXEPREFIX."client$EXE_EXT $other -l $debug $cm ". "-ORBnameserviceior $ior -ORBsvcconf $c_conf"; for ($j = 0; $j < $n; $j++) @@ -107,11 +107,13 @@ for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { - print "run_test [-n num] [-leave] [-onewin] [-d] [-h] [-nt] [-cm] [-sm] [-ns|sv|ff|cl|gf]\n"; + print "run_test [-n num] [-leave] [-onewin]" + "[-twowin] [-d] [-h] [-nt] [-cm] [-sm] [-ns|sv|ff|cl|gf]\n"; print "\n"; print "-n num -- runs the client num times\n"; print "-leave -- leaves the servers running and their windows open\n"; print "-onewin -- keeps all tests in one window on NT\n"; + print "-twowin -- put each test in a separate window on NT\n"; print "-d -- runs each in debug mode\n"; print "-h -- prints this information\n"; print "-nt num -- number of threads in the client (twice for server)\n"; @@ -197,6 +199,14 @@ for ($i = 0; $i <= $#ARGV; $i++) } last SWITCH; } + if ($ARGV[$i] eq "-twowin") + { + if ($^O eq "MSWin32") + { + $Process::newwindow = "yes"; + } + last SWITCH; + } $other = $other." ".$ARGV[$i]; } diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl index 7fcb67ec476..f4948d43f2f 100755 --- a/TAO/examples/Simple/bank/run_test.pl +++ b/TAO/examples/Simple/bank/run_test.pl @@ -11,11 +11,11 @@ require Process; $iorfile = "grid.ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile "); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile "); ACE::waitforfile ($iorfile); -$status = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile"); +$status = system ($EXEPREFIX."client$EXE_EXT -f $iorfile"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl index bc8a10e0fe3..ae10cef07a2 100755 --- a/TAO/examples/Simple/echo/run_test.pl +++ b/TAO/examples/Simple/echo/run_test.pl @@ -11,10 +11,10 @@ require Process; $iorfile = "echo.ior"; -$SV = Process::Create ("server$Process::EXE_EXT", "-o $iorfile "); +$SV = Process::Create ("server$EXE_EXT", "-o $iorfile "); sleep ($ACE::sleeptime); -$status = system ("client$Process::EXE_EXT -f $iorfile -x"); +$status = system ("client$EXE_EXT -f $iorfile -x"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl index 7c1e18a1afc..25622a4869f 100755 --- a/TAO/examples/Simple/grid/run_test.pl +++ b/TAO/examples/Simple/grid/run_test.pl @@ -11,11 +11,11 @@ require Process; $iorfile = "grid.ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile "); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile "); ACE::waitforfile ($iorfile); -$status = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345"); +$status = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl index 0baeef3d476..f28df1cc42f 100755 --- a/TAO/examples/Simple/time-date/run_test.pl +++ b/TAO/examples/Simple/time-date/run_test.pl @@ -11,11 +11,11 @@ require Process; $iorfile = "./ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); ACE::waitforfile ($iorfile); -$status = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -ORBSkipServiceConfigOpen"); +$status = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -ORBSkipServiceConfigOpen"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl index 855a403c494..83c8deddb96 100755 --- a/TAO/examples/Simple/time/run_test.pl +++ b/TAO/examples/Simple/time/run_test.pl @@ -11,11 +11,11 @@ require Process; $iorfile = "time.ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile "); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile "); ACE::waitforfile ($iorfile); -$status = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x"); +$status = system ($EXEPREFIX."client$EXE_EXT -f $iorfile -x"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl index 093cd2721a4..8e45e308169 100755 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl @@ -23,8 +23,8 @@ sub name_server { my $args = "-ORBnameserviceport $nsport"; my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service " - .$Process::EXE_EXT; - print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n"); + .$EXE_EXT; + print ("\nNaming_Service: $prog$EXE_EXT $args\n"); $NS = Process::Create ($prog, $args); } @@ -32,8 +32,8 @@ sub name_server sub server { my $args = "-ORBnameserviceport $nsport"; - print ("\nServer: server$Process::EXE_EXT $args\n"); - $SV = Process::Create ('.' . $DIR_SEPARATOR . "server " .$Process::EXE_EXT . $args); + print ("\nServer: server$EXE_EXT $args\n"); + $SV = Process::Create ('.' . $DIR_SEPARATOR . "server " .$EXE_EXT . $args); } @@ -41,7 +41,7 @@ sub client { my $args = "-ORBnameserviceport $nsport"; print ("\nclient: client $args\n"); - $CL = Process::Create ('.' . $DIR_SEPARATOR . "client " .$Process::EXE_EXT . $args); + $CL = Process::Create ('.' . $DIR_SEPARATOR . "client " .$EXE_EXT . $args); } name_server (); diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl index cfc7baacc2c..6876233521a 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl @@ -27,32 +27,32 @@ $CosEC2_params = "-n cosec2 -e 20 -o 5 -p \"6 21\""; sub cosec_multiple_test1 { # first start the Naming service.. - $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$Process::EXE_EXT,""); + $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT,""); sleep 10; # now start the Rt EC.. - $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$Process::EXE_EXT,""); + $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT,""); sleep 10; # now start the CosEC1.. - $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$Process::EXE_EXT,$CosEC1_params); + $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT,$CosEC1_params); sleep 10; # now start the CosEC2.. - $SV4 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$Process::EXE_EXT,$CosEC2_params); + $SV4 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT,$CosEC2_params); sleep 10; #start 1 consumer that uses CosEC1 to receive events - $CONS = Process::Create ($EXEPREFIX."consumer".$Process::EXE_EXT,"-n cosec1 -c $ev_count"); + $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT,"-n cosec1 -c $ev_count"); sleep 10; #start 1 supplier that uses CosEC2 to send events - $SUPP = Process::Create ($EXEPREFIX."supplier".$Process::EXE_EXT,"-n cosec2 -c $ev_count"); + $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT,"-n cosec2 -c $ev_count"); sleep 10; @@ -65,12 +65,12 @@ sub cosec_multiple_test1 #---------- #start 1 consumer that uses CosEC1 to receive events - $CONS2 = Process::Create ($EXEPREFIX."consumer".$Process::EXE_EXT,"-n cosec2 -c $ev_count"); + $CONS2 = Process::Create ($EXEPREFIX."consumer".$EXE_EXT,"-n cosec2 -c $ev_count"); sleep 10; #start 1 supplier that uses CosEC2 to send events - $SUPP2 = Process::Create ($EXEPREFIX."supplier".$Process::EXE_EXT,"-n cosec1 -c $ev_count"); + $SUPP2 = Process::Create ($EXEPREFIX."supplier".$EXE_EXT,"-n cosec1 -c $ev_count"); sleep 10; diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl index 1e9f2e36c40..af4a642e6e0 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl @@ -16,17 +16,17 @@ $ev_count = 8; sub cosec_multiple_test2 { # first start the Naming service.. - $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$Process::EXE_EXT,""); + $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT,""); sleep 10; # now start the Rt EC.. - $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$Process::EXE_EXT,""); + $SV2 = Process::Create ($EXEPREFIX."../../Event_Service/Event_Service".$EXE_EXT,""); sleep 10; # now start the CosEC1.. - $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$Process::EXE_EXT); + $SV3 = Process::Create ($EXEPREFIX."../../CosEvent_Service/CosEvent_Service".$EXE_EXT); sleep 10; @@ -34,7 +34,7 @@ sub cosec_multiple_test2 for ($cntr1 = 0; $cntr1 < $con_count ; $cntr1+=1) { print "creating consumer# $cntr1\n"; - $CONS = Process::Create ($EXEPREFIX."consumer".$Process::EXE_EXT, + $CONS = Process::Create ($EXEPREFIX."consumer".$EXE_EXT, "-c $ev_count"); sleep 10; } @@ -44,7 +44,7 @@ sub cosec_multiple_test2 for ($cntr2 = 0; $cntr2 < $con_count ; $cntr2+=1) { print "creating supplier# $cntr2\n"; - $SUPP = Process::Create ($EXEPREFIX."supplier".$Process::EXE_EXT, + $SUPP = Process::Create ($EXEPREFIX."supplier".$EXE_EXT, "-c $ev_count"); sleep 10; } diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl index f0b88f24d2c..aacf3f21d54 100755 --- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -$status = system ($EXEPREFIX."EC_Basic".$Process::EXE_EXT, ""); +$status = system ($EXEPREFIX."EC_Basic".$EXE_EXT, ""); # @@ Capture any errors from the server too. exit $status; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index abee5c67c57..5e1b901737d 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -14,20 +14,20 @@ $sleeptime = 5; $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. - "Naming_Service".$Process::EXE_EXT. + "Naming_Service".$EXE_EXT. " -o $NS_ior "); sleep $sleeptime; $ES = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Event_Service".$DIR_SEPARATOR. - "Event_Service".$Process::EXE_EXT); + "Event_Service".$EXE_EXT); -$C = Process::Create ($EXEPREFIX."ECM_Consumer".$Process::EXE_EXT); +$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT); sleep $sleeptime; -$S = Process::Create ($EXEPREFIX."ECM_Supplier".$Process::EXE_EXT); +$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT); $C->Wait (); $S->Wait (); diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 6a80cf9cf88..afb9ce8439a 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -11,13 +11,13 @@ require Process; $NS_ior = "NameService.ior"; $sleeptime = 3; -$NS = Process::Create ("../../Naming_Service/Naming_Service". - $Process::EXE_EXT." -o $NS_ior "); +$NS = Process::Create ("../../Naming_Service/Naming_Service".$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. +$status = system ($EXEPREFIX."EC_Multiple".$EXE_EXT. " -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 b9f3791d1b5..7f22ca966ee 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -11,7 +11,7 @@ require ACEutils; print STDERR "================ Collocated tests, single threaded\n"; -$T = Process::Create ($EXEPREFIX."ECT_Throughput".$Process::EXE_EXT, +$T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT, " -ORBsvcconf ec.conf -m new -u 10000 -n 1 -t 0" . " -c 4"); @@ -23,7 +23,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "================ Collocated tests, single threaded\n"; -$T = Process::Create ($EXEPREFIX."ECT_Throughput".$Process::EXE_EXT, +$T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT, " -ORBsvcconf ec.mt.conf -m new -u 10000 -n 1 -t 0" . " -c 4"); @@ -41,7 +41,7 @@ unlink $ns_ior; $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Naming_Service".$DIR_SEPARATOR. - "Naming_Service".$Process::EXE_EXT, + "Naming_Service".$EXE_EXT, " -o $ns_ior "); if (ACE::waitforfile_timed ($ns_ior, 5) == -1) { @@ -53,18 +53,18 @@ if (ACE::waitforfile_timed ($ns_ior, 5) == -1) { $ES = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. "Event_Service".$DIR_SEPARATOR. - "Event_Service".$Process::EXE_EXT, + "Event_Service".$EXE_EXT, " -ORBNameServiceIOR file://$ns_ior " ." -ORBSvcConf ec.conf " . " -t NEW"); sleep 5; -$C = Process::Create ($EXEPREFIX."ECT_Consumer".$Process::EXE_EXT, +$C = Process::Create ($EXEPREFIX."ECT_Consumer".$EXE_EXT, " -ORBNameServiceIOR file://$ns_ior " . " -c 4 -s 1"); -$S = Process::Create ($EXEPREFIX."ECT_Supplier".$Process::EXE_EXT, +$S = Process::Create ($EXEPREFIX."ECT_Supplier".$EXE_EXT, " -ORBNameServiceIOR file://$ns_ior " . " -s 1 -u 10000 -n 1 -t 0"); diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl index 5232c2ea79c..11ce92b0c9e 100755 --- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl @@ -17,7 +17,7 @@ $status = 0; print STDERR "\n\nReconnect suppliers and consumers,", " using disconnect/connect calls\n"; -$T = Process::Create ($prefix . "Reconnect", +$T = Process::Create ($prefix . "Reconnect".$EXE_EXT, " -suppliers 100 -consumers 100 -d 100"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: Test timedout\n"; @@ -26,7 +26,7 @@ if ($T->TimedWait (60) == -1) { } print STDERR "\n\nReconnect suppliers and consumers, using connect calls\n"; -$T = Process::Create ($prefix . "Reconnect", +$T = Process::Create ($prefix . "Reconnect".$EXE_EXT, " -suppliers 100 -consumers 100 -d 100 -s -c"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: Test timedout\n"; @@ -36,7 +36,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nShutdown EC with clients still attached\n"; -$T = Process::Create ($prefix . "Shutdown", +$T = Process::Create ($prefix . "Shutdown".$EXE_EXT, " -verbose -suppliers 5 -consumers 5"); if ($T->TimedWait (60) == -1) { print STDERR "ERROR: Test timedout\n"; @@ -47,7 +47,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nComplex event channel test,", "multiple ECs connected through gateways\n"; -$T = Process::Create ($prefix . "Observer", +$T = Process::Create ($prefix . "Observer".$EXE_EXT, " -ORBsvcconf observer.conf" ." -consumer_tshift 0 -consumers 5" ." -supplier_tshift 0 -suppliers 2" diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl index 829fa8af17a..3c775d16d5f 100755 --- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl @@ -16,7 +16,7 @@ $prefix = "." . $DIR_SEPARATOR; $status = 0; print STDERR "\n\nThroughput/Latency single threaded configuration\n"; -$T = Process::Create ($prefix . "Throughput", +$T = Process::Create ($prefix . "Throughput".$EXE_EXT, " -ORBsvcconf ec.st.conf " . "-burstsize 100000 -burstcount 1"); if ($T->TimedWait (60) == -1) { @@ -27,7 +27,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nThroughput/Latency MT-safe configuration\n"; -$T = Process::Create ($prefix . "Throughput", +$T = Process::Create ($prefix . "Throughput".$EXE_EXT, " -burstsize 100000" ." -burstcount 1"); if ($T->TimedWait (60) == -1) { @@ -38,7 +38,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nThroughput/Latency MT-safe configuration, 4 consumers\n"; -$T = Process::Create ($prefix . "Throughput", +$T = Process::Create ($prefix . "Throughput".$EXE_EXT, " -burstsize 100000" ." -burstcount 1 -consumers 4"); if ($T->TimedWait (60) == -1) { @@ -50,7 +50,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nThroughput/Latency MT-safe configuration,", " 4 consumers 4 suppliers\n"; -$T = Process::Create ($prefix . "Throughput", +$T = Process::Create ($prefix . "Throughput".$EXE_EXT, " -burstsize 100000" ." -burstcount 1 -consumers 4 -suppliers 4"); if ($T->TimedWait (60) == -1) { @@ -62,7 +62,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nThroughput/Latency MT-safe configuration,", " 4 consumers 4 suppliers\n"; -$T = Process::Create ($prefix . "Throughput", +$T = Process::Create ($prefix . "Throughput".$EXE_EXT, " -burstsize 100000" ." -burstcount 1 -consumers 4 -suppliers 4" ." -consumers_tshift 0 -suppliers_tshift 0"); @@ -74,7 +74,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nConnection and disconnection time,", " 100 consumers 100 suppliers\n"; -$T = Process::Create ($prefix . "Connect", +$T = Process::Create ($prefix . "Connect".$EXE_EXT, " -consumers 100 -suppliers 100" ." -connection_order interleaved"); if ($T->TimedWait (60) == -1) { @@ -86,7 +86,7 @@ if ($T->TimedWait (60) == -1) { print STDERR "\n\nConnection and disconnection time,", " 500 consumers 500 suppliers\n"; -$T = Process::Create ($prefix . "Connect", +$T = Process::Create ($prefix . "Connect".$EXE_EXT, " -consumers 500 -suppliers 500" ." -connection_order interleaved"); if ($T->TimedWait (60) == -1) { diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl index 0004b4229f5..d1a48c5cc98 100755 --- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl +++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl @@ -11,16 +11,16 @@ require Process; $NS_ior = "NameService.ior"; $sleeptime = 3; -$NS = Process::Create ("../../Naming_Service/Naming_Service". - $Process::EXE_EXT." -o $NS_ior "); +$NS = Process::Create ("../../Naming_Service/Naming_Service".$EXE_EXT, + " -o $NS_ior "); sleep $sleeptime; -$ES = Process::Create ("../../Event_Service/Event_Service".$Process::EXE_EXT); +$ES = Process::Create ("../../Event_Service/Event_Service".$EXE_EXT); sleep $sleeptime; -$status = system ($EXEPREFIX."Event_Latency".$Process::EXE_EXT. +$status = system ($EXEPREFIX."Event_Latency".$EXE_EXT. " -j -m 100"); $NS->Kill (); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index db65f2c736c..41cb3f46991 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -22,12 +22,12 @@ unlink $implrepo_ior; sub airplane_test { - $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, + $SV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT, "-o $airplane_ior"); ACE::waitforfile ($airplane_ior); - $status = system ($EXEPREFIX."airplane_client".$Process::EXE_EXT. + $status = system ($EXEPREFIX."airplane_client".$EXE_EXT. " -k file://$airplane_ior"); $SV->Kill (); $SV->Wait (); @@ -36,29 +36,29 @@ 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".$EXE_EXT, "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, + $SV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT, "-o $airplane_ior -i -r"); ACE::waitforfile ($airplane_ior); - system($EXEPREFIX."airplane_client -k file://$airplane_ior"); + system($EXEPREFIX."airplane_client.$EXE_EXT -k file://$airplane_ior"); $IR->Kill (); $IR->Wait (); } sub nestea_test { - $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, + $SV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT, "-o $nestea_ior"); ACE::waitforfile ($nestea_ior); - $status = system ($EXEPREFIX."nestea_client".$Process::EXE_EXT. + $status = system ($EXEPREFIX."nestea_client".$EXE_EXT. " -k file://$nestea_ior"); $SV->Kill (); $SV->Wait (); @@ -68,42 +68,42 @@ 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".$EXE_EXT, "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, + $SV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT, "-o $nestea_ior -i -r"); ACE::waitforfile ($nestea_ior); - system($EXEPREFIX."nestea_client -k file://$nestea_ior"); + system($EXEPREFIX."nestea_client.$EXE_EXT -k file://$nestea_ior"); $IR->Kill (); $IR->Wait (); } 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".$EXE_EXT, "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - $NSV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, + $NSV = Process::Create ($EXEPREFIX."nestea_server".$EXE_EXT, "-o $nestea_ior -i -r"); - $ASV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, + $ASV = Process::Create ($EXEPREFIX."airplane_server".$EXE_EXT, "-o $airplane_ior -i -r"); ACE::waitforfile ($nestea_ior); - $NCL = Process::Create ($EXEPREFIX."nestea_client".$Process::EXE_EXT, + $NCL = Process::Create ($EXEPREFIX."nestea_client".$EXE_EXT, "-k file://$nestea_ior"); ACE::waitforfile ($airplane_ior); - system($EXEPREFIX."airplane_client -k file://$airplane_ior"); + system($EXEPREFIX."airplane_client.$EXE_EXT -k file://$airplane_ior"); $NCL->Kill (); $NCL->Wait (); $IR->Kill (); $IR->Wait (); diff --git a/TAO/orbsvcs/tests/Logger/run_test.pl b/TAO/orbsvcs/tests/Logger/run_test.pl index bf052ebdb58..c54cfb2facf 100755 --- a/TAO/orbsvcs/tests/Logger/run_test.pl +++ b/TAO/orbsvcs/tests/Logger/run_test.pl @@ -19,7 +19,7 @@ sub service { my $args = ""; my $prog = $EXEPREFIX."$tao_root/orbsvcs/Logging_Service/Logging_Service" - .$Process::EXE_EXT; + .$EXE_EXT; $SV = Process::Create ($prog, $args); } @@ -27,7 +27,7 @@ sub service sub test { my $args = ""; - my $prog = $EXEPREFIX."Logging_Test".$Process::EXE_EXT; + my $prog = $EXEPREFIX."Logging_Test".$EXE_EXT; system ("$prog $args"); } diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index c287ed68236..474faed8f27 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -23,8 +23,8 @@ sub name_server { my $args = "-ORBnameserviceport $nsport"; my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service" - .$Process::EXE_EXT; - print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n"); + .$EXE_EXT; + print ("\nNaming_Service: $prog$EXE_EXT $args\n"); $NS = Process::Create ($prog, $args); } @@ -32,8 +32,8 @@ sub name_server sub server { my $args = "-ORBnameserviceport $nsport"; - print ("\nServer: server$Process::EXE_EXT $args\n"); - $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", $args); + print ("\nServer: server$EXE_EXT $args\n"); + $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", $args); } @@ -41,7 +41,7 @@ sub client { my $args = "-ORBnameserviceport $nsport"; print ("\nclient: client $args\n"); - $CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT", $args); + $CL = Process::Create ($EXEPREFIX."client$EXE_EXT", $args); } name_server (); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index bf06e4c8fb1..3502343dc7b 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -27,7 +27,7 @@ sub name_server my $args = "-ORBnameserviceport $nsmport -o $iorfile"; my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR". "Naming_Service".$DIR_SEPARATOR. - "Naming_Service".$Process::EXE_EXT; + "Naming_Service".$EXE_EXT; unlink $iorfile; $NS = Process::Create ($prog, $args); @@ -43,7 +43,7 @@ sub client { my $args = $_[0]." "."-ORBnameserviceport $nsmport ". "-ORBnameserviceior file://$iorfile"; - my $prog = $EXEPREFIX."client".$Process::EXE_EXT; + my $prog = $EXEPREFIX."client".$EXE_EXT; $CL = Process::Create ($prog, $args); } diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl index 12ee53d39d6..a0236d03047 100755 --- a/TAO/orbsvcs/tests/Time/run_test.pl +++ b/TAO/orbsvcs/tests/Time/run_test.pl @@ -23,15 +23,15 @@ $time_dir = "..$DIR_SEPARATOR..".$DIR_SEPARATOR."Time_Service".$DIR_SEPARATOR; sub time_service_test_using_naming_service { - $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT,""); + $SV1 = Process::Create ($time_dir."server".$EXE_EXT,""); sleep 5; - $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT,"-t 2"); + $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT,"-t 2"); sleep 10; - $status = system ($EXEPREFIX."client".$Process::EXE_EXT. + $status = system ($EXEPREFIX."client".$EXE_EXT. ""); $SV1->Kill (); @@ -42,20 +42,20 @@ sub time_service_test_using_naming_service sub time_service_test_using_files { - $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT, + $SV1 = Process::Create ($time_dir."server".$EXE_EXT, "-o $server_ior"); ACE::waitforfile ($server_ior); sleep 5; - $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT, + $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT, "-f $server_ior -o clerk_ior -t 2"); ACE::waitforfile ($clerk_ior); sleep 10; - $status = system ($EXEPREFIX."client".$Process::EXE_EXT. + $status = system ($EXEPREFIX."client".$EXE_EXT. " -f clerk_ior"); $SV1->Kill (); @@ -70,24 +70,24 @@ 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".$EXE_EXT, "-ORBsvcconf implrepo.conf -d 1"); ACE::waitforfile ($implrepo_ior); - $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT, + $SV1 = Process::Create ($time_dir."server".$EXE_EXT, "-o $server_ior -i -r"); ACE::waitforfile ($server_ior); sleep 10; - $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT, + $SV2 = Process::Create ($time_dir."clerk".$EXE_EXT, "-f $server_ior -o clerk_ior"); sleep 10; - system($EXEPREFIX."client -f $clerk_ior"); + system($EXEPREFIX."client.$EXE_EXT -f $clerk_ior"); $IR->Kill (); $IR->Wait (); 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 de86a434f0a..5ae90621453 100755 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl @@ -78,11 +78,11 @@ for ($i = 0; $i <= $#ARGV; $i++) } } -(-f $svexepref."server".$Process::EXE_EXT && - -f $clexepref."client".$Process::EXE_EXT) || +(-f $svexepref."server".$EXE_EXT && + -f $clexepref."client".$EXE_EXT) || die "$0: server and/or client need to be built!\n"; -$SV = Process::Create ($svexepref."server".$Process::EXE_EXT, +$SV = Process::Create ($svexepref."server".$EXE_EXT, $svflags. $svnsflags); @@ -94,7 +94,7 @@ if (ACE::waitforfile_timed ($iorfile, 10) == -1) { exit 1; } -$CL = Process::Create ($clexepref . "client".$Process::EXE_EXT, +$CL = Process::Create ($clexepref . "client".$EXE_EXT, " $clflags $clnsflags -x"); $client = $CL->TimedWait (60); 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 c1b8d3a5f4a..217a2758b22 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl @@ -54,7 +54,7 @@ $threads = $low_priority_threads + 1; # Make sure the file is gone, so we can wait on it. unlink $iorfile; -$SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $Process::EXE_EXT, +$SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $EXE_EXT, " $gioplite $thread_per_rate -f $iorfile -t $threads"); sleep $sleeptime; @@ -65,7 +65,7 @@ if (ACE::waitforfile_timed ($iorfile, 10) == -1) { exit 1; } -$CL = Process::Create ('.' . $DIR_SEPARATOR . "client" . $Process::EXE_EXT . +$CL = Process::Create ('.' . $DIR_SEPARATOR . "client" . $EXE_EXT . " $gioplite $thread_per_rate " . "-f $iorfile -n $iterations -t $threads"); diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl index 5c3e07faa6f..c90117829d3 100755 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl @@ -9,7 +9,7 @@ unshift @INC, '../../../bin'; require Process; require ACEutils; -$T = Process::Create ($EXEPREFIX."registration"); +$T = Process::Create ($EXEPREFIX."registration.$EXE_EXT"); $client = $T->TimedWait (60); if ($client == -1) { diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl index c8fd0dd3651..95600c86b4e 100755 --- a/TAO/tests/CDR/run_test.pl +++ b/TAO/tests/CDR/run_test.pl @@ -22,7 +22,7 @@ sub run_test my $args = shift (@argslist); print STDERR "\n$brace $test $args test BEGUN\n"; - $TST = Process::Create ($EXEPREFIX."$test".$Process::EXE_EXT, + $TST = Process::Create ($EXEPREFIX."$test".$EXE_EXT, "$args"); print STDERR "\t$test RUNNING\n"; $retval = ($TST->Wait ()) / 256; diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl index 7f7f19cbbca..a407b04ce1c 100755 --- a/TAO/tests/DynAny_Test/run_test.pl +++ b/TAO/tests/DynAny_Test/run_test.pl @@ -15,7 +15,7 @@ sub run_test { my $type = shift(@_); - $BT = Process::Create ($EXEPREFIX."basic_test".$Process::EXE_EXT, + $BT = Process::Create ($EXEPREFIX."basic_test".$EXE_EXT, " -t $type"); $test = $BT->TimedWait (10); diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl index 5adff0ff273..0ef900d07f4 100755 --- a/TAO/tests/MT_Client/run_test.pl +++ b/TAO/tests/MT_Client/run_test.pl @@ -25,7 +25,7 @@ foreach $i (@ARGV) { } $iorfile = "server.ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT ", +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -ORBsvcconf server.conf -ORBdebuglevel $debug_level" . " -o $iorfile"); @@ -35,7 +35,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."$client_process$Process::EXE_EXT ", +$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ", " -ORBsvcconf $client_conf " . "-ORBdebuglevel $debug_level" . " -k file://$iorfile " diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl index a5533c0989c..62efff0ff29 100755 --- a/TAO/tests/Multiple_Inheritance/run_test.pl +++ b/TAO/tests/Multiple_Inheritance/run_test.pl @@ -9,11 +9,11 @@ unshift @INC, '../../../bin'; require ACEutils; $iorfile = "server.ior"; -$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", " -f $iorfile"); +$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $iorfile"); ACE::waitforfile ($iorfile); -$status = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile"); +$status = system ($EXEPREFIX."client$EXE_EXT -f $iorfile"); $SV->Kill (); $SV->Wait (); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl index 4b3ca7cc204..48e71e1d4db 100755 --- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl @@ -16,7 +16,7 @@ $ior2file = "server2.ior"; unlink $ior1file; unlink $ior2file; -$SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV1 = Process::Create ($EXEPREFIX."server".$EXE_EXT, " -o $ior1file "); if (ACE::waitforfile_timed ($ior1file, 5) == -1) { @@ -25,7 +25,7 @@ if (ACE::waitforfile_timed ($ior1file, 5) == -1) { exit 1; } -$SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV2 = Process::Create ($EXEPREFIX."server".$EXE_EXT, " -o $ior2file "); if (ACE::waitforfile_timed ($ior2file, 5) == -1) { @@ -34,7 +34,7 @@ if (ACE::waitforfile_timed ($ior2file, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT, +$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, " -f $ior1file -g $ior2file -n 2 -i 10 -s 5"); $client = $CL->TimedWait (60); diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl index 64186b47432..a522b284d63 100755 --- a/TAO/tests/NestedUpcall/Reactor/run_test.pl +++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl @@ -14,7 +14,7 @@ $mtfile="mttest.ior"; print STDERR "\n\n==== Single-threaded test\n"; -$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, "-o $file"); if (ACE::waitforfile_timed ($file, 3) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; @@ -22,7 +22,7 @@ if (ACE::waitforfile_timed ($file, 3) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT, +$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, " -x -k file://$file"); $client = $CL->TimedWait (60); @@ -48,7 +48,7 @@ print STDERR "\n\n==== Multi-threaded test\n"; print STDERR "Grace period, waiting for the system to stabilize...."; sleep 5; -$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, " -o $mtfile"); if (ACE::waitforfile_timed ($mtfile, 3) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; @@ -56,7 +56,7 @@ if (ACE::waitforfile_timed ($mtfile, 3) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."mt_client".$Process::EXE_EXT, +$CL = Process::Create ($EXEPREFIX."mt_client".$EXE_EXT, " -x -k file://$mtfile -ORBsvcconf svc.mt.conf"); $client = $CL->TimedWait (60); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index 77cb5613288..bf102c41d97 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -16,7 +16,7 @@ $ior2file = "serverb.ior"; unlink $ior1file; unlink $ior2file; -$SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT, +$SV1 = Process::Create ($EXEPREFIX."server_A".$EXE_EXT, "-o $ior1file"); if (ACE::waitforfile_timed ($ior1file, 5) == -1) { @@ -25,7 +25,7 @@ if (ACE::waitforfile_timed ($ior1file, 5) == -1) { exit 1; } -$SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT, +$SV2 = Process::Create ($EXEPREFIX."server_B".$EXE_EXT, "-o $ior2file"); if (ACE::waitforfile_timed ($ior2file, 5) == -1) { @@ -34,7 +34,7 @@ if (ACE::waitforfile_timed ($ior2file, 5) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."initiator".$Process::EXE_EXT, +$CL = Process::Create ($EXEPREFIX."initiator".$EXE_EXT, " -f $ior1file -g $ior2file"); $client = $CL->TimedWait (60); diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl index 96cf18be595..9e34f1807bf 100755 --- a/TAO/tests/OctetSeq/run_test.pl +++ b/TAO/tests/OctetSeq/run_test.pl @@ -15,7 +15,7 @@ $file="test.ior"; unlink $file; -$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, +$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, "-o $file"); if (ACE::waitforfile_timed ($file, 3) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; @@ -23,7 +23,7 @@ if (ACE::waitforfile_timed ($file, 3) == -1) { exit 1; } -$CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT, +$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, " -i 5000 -k file://$file"); $client = $CL->TimedWait (60); @@ -46,7 +46,7 @@ unlink $file; print STDERR "\n\n==== Octet sequence performance test\n"; -$T = Process::Create ($EXEPREFIX."OctetSeq$Process::EXE_EXT", +$T = Process::Create ($EXEPREFIX."OctetSeq$EXE_EXT", " -n 32 -l 8192 -h 8192 -s 1 -q"); $client = $T->TimedWait (60); diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl index a03f76443d2..7b41a9f3a63 100755 --- a/TAO/tests/Param_Test/run_test.pl +++ b/TAO/tests/Param_Test/run_test.pl @@ -23,7 +23,10 @@ sub run_test my $type = shift(@_); unlink $iorfile; # Ignore errors - $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, + print STDERR "==== Testing $type === wait....\n"; + sleep 2; + + $SV = Process::Create ($EXEPREFIX."server".$EXE_EXT, "$debug -o $iorfile"); if (ACE::waitforfile_timed ($iorfile, 5) == -1) { @@ -32,7 +35,7 @@ sub run_test exit 1; } - $CL = Process::Create ($EXEPREFIX."client", + $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT, " $debug -f $iorfile -i $invocation -t ". "$type -n $num -x"); @@ -48,10 +51,23 @@ sub run_test $SV->Kill (); $SV->TimedWait (1); } unlink $iorfile; + + print STDERR "==== Test for $type finished ===\n"; } # Parse the arguments +@types = ("short", "ulonglong", "ubstring", "bdstring", "fixed_struct", + "ub_strseq", "bd_strseq", + "var_struct", "nested_struct", "recursive_struct", + "ub_struct_seq", "bd_struct_seq", + "any", "objref", "objref_sequence", "objref_struct", + "any_sequence", + "ub_short_sequence", "ub_long_sequence", + "bd_short_sequence", "bd_long_sequence", + "fixed_array", "var_array", "typecode", "exception", + "big_union", "complex_any"); + for ($i = 0; $i <= $#ARGV; $i++) { SWITCH: @@ -84,13 +100,21 @@ for ($i = 0; $i <= $#ARGV; $i++) { if ($^O eq "MSWin32") { - $Process::newwindow = "no"; + $newwindow = "no"; + } + last SWITCH; + } + if ($ARGV[$i] eq "-twowin") + { + if ($^O eq "MSWin32") + { + $newwindow = "yes"; } last SWITCH; } if ($ARGV[$i] eq "-t") { - $type = $ARGV[$i + 1]; + @types = split (',', $ARGV[$i + 1]); $i++; last SWITCH; } @@ -104,27 +128,8 @@ for ($i = 0; $i <= $#ARGV; $i++) } } -@types = ("short", "ulonglong", "ubstring", "bdstring", "fixed_struct", - "ub_strseq", "bd_strseq", - "var_struct", "nested_struct", "recursive_struct", - "ub_struct_seq", "bd_struct_seq", - "any", "objref", "objref_sequence", "objref_struct", - "any_sequence", - "ub_short_sequence", "ub_long_sequence", - "bd_short_sequence", "bd_long_sequence", - "fixed_array", "var_array", "typecode", "exception", - "big_union", "complex_any"); - -if ($type ne "") -{ +foreach $type (@types) { run_test ($type); } -else -{ - foreach $type (@types) - { - run_test ($type); - } -} unlink $iorfile; |