diff options
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/run_test.pl | 6 | ||||
| -rwxr-xr-x | TAO/utils/nslist/run_test.pl | 4 |
5 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 127cf69fe8d..8faafa40174 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Sep 11 12:41:22 2004 Steve Totten <totten_s@ociweb.com> + + * orbsvcs/tests/ImplRepo/run_test.pl: + * orbsvcs/tests/ImplRepo/NameService/run_test.pl: + * orbsvcs/tests/ImplRepo/locked/run_test.pl: + * utils/nslist/run_test.pl: + Removed some trailing blanks and tab characters from these + files. + Sat Sep 11 12:25:07 2004 Steve Totten <totten_s@ociweb.com> * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index 209bbb7dce6..037a604d364 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -58,7 +58,7 @@ if (PerlACE::waitforfile_timed ($activator_ior, 10) == -1) { $TAO_IMR->Arguments("$imr_init_ref" . " add NameService " - ." -c \"" . $NS->Executable () + ." -c \"" . $NS->Executable () ." $imr_init_ref" ." -ORBUseIMR 1 .\""); @@ -111,7 +111,7 @@ if ($taoimr != 0) { ################################################################################ ## Kill the IMR -$iserver = $ACTIVATOR->TerminateWaitKill (5); +$iserver = $ACTIVATOR->TerminateWaitKill (5); if ($iserver != 0) { print STDERR "ERROR: ImR_Activator returned $iserver\n"; diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl index 4820f73cf45..099f5fdad62 100755 --- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl @@ -57,7 +57,7 @@ if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) { print "===== Adding a server\n"; $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior" - . " add Foo -c foobarbaz"); + . " add Foo -c foobarbaz"); $taoimr = $TAO_IMR->SpawnWaitKill (60); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index 359e15c2cea..ea222c7e56b 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -133,7 +133,7 @@ sub nt_service_test my $result = 0; # Just to show that it's possible, this test uses corbaloc instead of ior file. - my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; + my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; # To avoid having to ensure that they LocalSystem account has the correct path # we simply copy the imr executables to the same directory as the DLL's. @@ -575,7 +575,7 @@ sub persistent_ir_test $status = 1; } - return $status; + return $status; } ############################################################################### @@ -610,7 +610,7 @@ sub both_ir_test . " -ORBUseIMR 1 $refstyle -o $nestea_ior $imr_initref\""); $TAO_IMR->SpawnWaitKill (10); - $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" + $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" . $A_SVR->Executable () . " -ORBUseIMR 1 $refstyle -o $airplane_ior $imr_initref\""); $TAO_IMR->SpawnWaitKill (10); diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl index c04a9a4cf3f..6d9b1032d1f 100755 --- a/TAO/utils/nslist/run_test.pl +++ b/TAO/utils/nslist/run_test.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -# This is a Perl script that runs some Naming Service tests. +# This is a Perl script that runs some Naming Service tests. # It runs all the tests that will run with min CORBA. # It starts all the servers and clients as necessary. @@ -37,7 +37,7 @@ sub name_server if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { print STDERR "ERROR: cannot find IOR file <$iorfile>\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } } |