diff options
| -rwxr-xr-x | TAO/examples/Callback_Quoter/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/examples/Quoter/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl | 6 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/EC_Multiple/run_test.pl | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/EC_Throughput/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Event_Latency/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Property/run_test.pl | 6 |
9 files changed, 14 insertions, 16 deletions
diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl index 3e4ac9098be..5b2983d380e 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".$EXE_EXT, + "Naming_Server".$EXE_EXT, " -o $ns_ior "); if (ACE::waitforfile_timed ($ns_ior, 5) == -1) { diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl index 72d6fbc2351..22e901ece37 100755 --- a/TAO/examples/Quoter/run_test.pl +++ b/TAO/examples/Quoter/run_test.pl @@ -49,7 +49,7 @@ sub name_server my $args = "$other -o $nsiorfile"; my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR". "Naming_Service$DIR_SEPARATOR". - "Naming_Service$EXE_EXT"; + "Naming_Server$EXE_EXT"; $NS = Process::Create ($prog, $args); } diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl index ab2990aef7b..de0dd0171b9 100755 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl @@ -23,7 +23,7 @@ sub name_server my $prog = "..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR - ."Naming_Server".$DIR_SEPARATOR + ."Naming_Service".$DIR_SEPARATOR ."Naming_Server ".$EXE_EXT; print ("\nNaming_Server $args\n"); $NS = Process::Create ($prog, $args); @@ -70,11 +70,11 @@ $SV->Terminate (); if ($SV->TimedWait (5) == -1) { $NS->Kill (); $NS->TimedWait (1); exit 1; } - + $NS->Terminate (); if ($NS->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate naming service\n"; $NS->Kill (); $NS->TimedWait (1); exit 1; } - + exit $status; diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl index 4cf296d5cf6..1c657f3b0bf 100755 --- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl @@ -30,7 +30,7 @@ sub cosec_multiple_test1 # first start the Naming service.. $SV1 = Process::Create ("..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR - ."Naming_Server".$DIR_SEPARATOR + ."Naming_Service".$DIR_SEPARATOR ."Naming_Server".$EXE_EXT, ""); sleep 10; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index e5c637bb8bb..b77427295a9 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -15,7 +15,7 @@ $status = 0; $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. - "Naming_Server".$DIR_SEPARATOR. + "Naming_Service".$DIR_SEPARATOR. "Naming_Server".$EXE_EXT, " -o $NS_ior "); @@ -66,5 +66,3 @@ unlink $NS_ior; # @@ Capture the errors from the processes. exit $status; - - diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 87915cb0f50..757c34edf68 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -14,7 +14,7 @@ $status = 0; $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. - "Naming_Server".$DIR_SEPARATOR. + "Naming_Service".$DIR_SEPARATOR. "Naming_Server".$EXE_EXT, " -o $NS_ior "); if (ACE::waitforfile_timed ($NS_ior, 5) == -1) { @@ -37,6 +37,6 @@ $NS->Terminate (); if ($NS->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate naming service\n"; $NS->Kill (); $NS->TimedWait (1); exit 1; -} +} exit $status; diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index 35564d005d5..1ae68d5be58 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -40,7 +40,7 @@ $ns_ior = "NameService.ior"; unlink $ns_ior; $NS = Process::Create ("..".$DIR_SEPARATOR. "..".$DIR_SEPARATOR. - "Naming_Server".$DIR_SEPARATOR. + "Naming_Service".$DIR_SEPARATOR. "Naming_Server".$EXE_EXT, " -o $ns_ior "); diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl index cdddd5dde5b..05dc50eaf67 100755 --- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl +++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl @@ -15,7 +15,7 @@ $status = 0; $NS = Process::Create ("..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR - ."Naming_Server".$DIR_SEPARATOR + ."Naming_Service".$DIR_SEPARATOR ."Naming_Server".$EXE_EXT, " -o $NS_ior "); diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index ada53c35f7d..3b20f1e86bd 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -21,13 +21,13 @@ $nsior = "ns.ior"; sub name_server { my $args = " -o $nsior"; - my $prog = + my $prog = print STDERR ("\nNaming_Server: $args\n"); unlink $nsior; $NS = Process::Create ("..".$DIR_SEPARATOR ."..".$DIR_SEPARATOR - ."Naming_Server".$DIR_SEPARATOR + ."Naming_Service".$DIR_SEPARATOR ."Naming_Server".$EXE_EXT, $args); if (ACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; @@ -71,7 +71,7 @@ $SV->Terminate (); if ($SV->TimedWait (5) == -1) { $NS->Kill (); $NS->TimedWait (1); exit 1; } - + $NS->Terminate (); if ($NS->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate naming service\n"; $NS->Kill (); $NS->TimedWait (1); |