From 6b925ebe17583e3602d625f50d2b63131d3ddabb Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 May 2019 11:30:47 +0200 Subject: Make use of $ENV{TAO_ROOT}/orbsvcs instead of a relative path * TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: * TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl: * TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: * TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: * TAO/orbsvcs/tests/EC_Multiple/run_test.pl: * TAO/orbsvcs/tests/EC_Throughput/run_test.pl: * TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl: * TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: * TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: * TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl: * TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: * TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: * TAO/orbsvcs/tests/ImplRepo/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: * TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl: * TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl: * TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: * TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: * TAO/orbsvcs/tests/Notify/Basic/run_test.pl: * TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: * TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl: * TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: * TAO/orbsvcs/tests/Notify/Lanes/run_test.pl: * TAO/orbsvcs/tests/Notify/MC/run_test.pl: * TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: * TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: * TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl: * TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl: * TAO/orbsvcs/tests/Notify/Timeout/run_test.pl: * TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl: * TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h: * TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl: * TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl: * TAO/orbsvcs/tests/Property/run_test.pl: * TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: * TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: * TAO/orbsvcs/tests/Time/run_test.pl: * TAO/orbsvcs/tests/Trading/run_test.pl: --- TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl | 4 ++-- TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl | 4 ++-- TAO/orbsvcs/tests/EC_Multiple/run_test.pl | 2 +- TAO/orbsvcs/tests/EC_Throughput/run_test.pl | 4 ++-- TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl | 4 ++-- TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl | 6 +++--- TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl | 6 +++--- TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl | 4 ++-- TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl | 2 +- TAO/orbsvcs/tests/ImplRepo/run_test.pl | 6 +++--- TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl | 4 ++-- TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl | 4 ++-- .../tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl | 2 +- TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl | 2 +- .../LoadBalancing/GenericFactory/Application_Controlled/run_test.pl | 2 +- .../GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl | 2 +- .../GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl | 2 +- .../GenericFactory/Infrastructure_Controlled/run_test.pl | 2 +- .../LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl | 2 +- TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Basic/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Blocking/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl | 6 +++--- TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Discarding/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Lanes/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/MC/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Ordering/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Timeout/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h | 1 - TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl | 4 ++-- .../performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl | 4 ++-- .../performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl | 4 ++-- .../performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl | 2 +- .../scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl | 2 +- .../performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl | 2 +- .../scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl | 2 +- .../performance-tests/scripts/Max_Throughput/Colocated/run_test.pl | 2 +- .../scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl | 2 +- .../performance-tests/scripts/Max_Throughput/Notify/run_test.pl | 4 ++-- .../scripts/Max_Throughput/Notify_RTCORBA/run_test.pl | 4 ++-- .../performance-tests/scripts/Paths_vs_Throughput/run_notify.pl | 4 ++-- .../performance-tests/scripts/Paths_vs_Throughput/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Property/run_test.pl | 2 +- TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl | 2 +- TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl | 4 ++-- TAO/orbsvcs/tests/Time/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Trading/run_test.pl | 2 +- 87 files changed, 134 insertions(+), 135 deletions(-) diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl index f830392f7e5..4d864c5e00a 100755 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl @@ -29,7 +29,7 @@ my $iorbase = "test.ior"; my $server_iorfile = $server->LocalFile ($iorbase); $server->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$orb_port -o $server_iorfile"); $CL = $client->CreateProcess ("TimeServer", "-ORBInitRef NameService=corbaloc:iiop:$host:$orb_port/NameService"); diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl index 568ac14f54d..233a392ec27 100755 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl @@ -33,7 +33,7 @@ $CLI = $ns->CreateProcess ("client"); # Fire up the Name Service # -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level ". "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl index fea15548302..e4aec517a7e 100755 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl @@ -12,7 +12,7 @@ $status = 0; my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp"); # The location of the IFR_Service binary -my $ifr_service_bin = "../../IFR_Service"; +my $ifr_service_bin = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service"; # The location of the tao_ifr utility binary my $tao_ifr_bin = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl index f394dcfec01..2a86a2bab55 100755 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl @@ -23,7 +23,7 @@ my $activator = PerlACE::TestTarget::create_target (4) || die "Create target 4 f my $tao_imr = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; # The location of the implementation repository binaries -my $imr_bin_path = "../../ImplRepo_Service"; +my $imr_bin_path = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service"; # The location of the tao_imr IMR utility my $tao_imr_bin_path = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl index 66dd0f0b1c1..29cf0f69e46 100755 --- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl @@ -20,7 +20,7 @@ my $ifr_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 my $tao_ifr = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; # The location of the implementation repository binaries -my $ifr_bin_path = "../../IFR_Service"; +my $ifr_bin_path = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service"; # The location of the tao_ifr IFR utility my $tao_ifr_bin_path = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl index 45884aada56..d67223afd2b 100755 --- a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl @@ -38,11 +38,11 @@ $tao_imr->DeleteFile ($imr_ior); # Run the IMR locator on a fixed port my $locator_port = $locator->RandomPort(); -$LC = $locator->CreateProcess ("../../ImplRepo_Service/tao_imr_locator", +$LC = $locator->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-ORBdebuglevel $debug_level -o $locator_imr_iorfile ". "-ORBEndpoint iiop://:$locator_port"); -$AC = $activator->CreateProcess ("../../ImplRepo_Service/tao_imr_activator", +$AC = $activator->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator", "-ORBdebuglevel $debug_level -o $activator_iorfile ". "-ORBInitRef ImplRepoService=file://$activator_imr_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl index 63d205ad449..a2381d99152 100755 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("testclient", "-ORBInitRef InterfaceRepository=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl index cdb00ddac27..3b91530ebb7 100755 --- a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl @@ -35,7 +35,7 @@ my $ns_list_iorfile = $ns_list->LocalFile ($iorbase); $ns_service->DeleteFile($iorbase); $ns_list->DeleteFile($iorbase); -$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/tao_cosnaming", +$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $ns_service_iorfile ". "-ORBObjRefStyle URL -ORBEndpoint shmiop:// -ORBSvcConfDirective ". "\"dynamic SHMIOP_Factory Service_Object ". diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl index 630ddffee67..0732abd4b2b 100755 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl @@ -49,9 +49,9 @@ $ns2->DeleteFile ($ns2_ior); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("client", ""); -$NS1 = $ns1->CreateProcess("../../Naming_Service/tao_cosnaming", +$NS1 = $ns1->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint1 -o $ns1_iorfile -m 0"); -$NS2 = $ns2->CreateProcess("../../Naming_Service/tao_cosnaming", +$NS2 = $ns2->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint2 -o $ns2_iorfile -m 0"); # Run two Naming Servers diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index aea88ee2344..554e85b8f78 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -30,11 +30,11 @@ $server3->DeleteFile ($naming_ior); $client->DeleteFile ($naming_ior); -$SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBNameServicePort $port " . "-o $server1_naming_ior"); -$SV2 = $server2->CreateProcess ("../../Event_Service/tao_rtevent", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$server2_naming_ior"); $SV3 = $server3->CreateProcess ("ECM_Supplier", diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 3add0becd10..619b8831e2f 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("EC_Multiple", diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index fbcff3492c0..19237263edc 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -64,10 +64,10 @@ if ($T_status != 0) { print STDERR "================ Remote test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent", +$ES = $es->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$es_nsiorfile ". "-ORBSvcConf $es_ecconffile ". "-s local"); diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl index 45c5ec09f4e..38d88e43283 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl @@ -40,10 +40,10 @@ $sup2->DeleteFile ($nsiorfile); print STDERR "================ Overflow test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent", +$ES = $es->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$es_nsiorfile ". " -ORBSvcConf $es_ecmtconffile ". " -s local"); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl index e77707d49a2..afa6ba895d5 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl @@ -41,9 +41,9 @@ $act->DeleteFile ($actiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-o $imr_imriorfile"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator", +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator", "-o $act_actiorfile ". "-ORBInitRef ImplRepoService=file://$act_imriorfile"); $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index 4c558928466..afeff4a3969 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -37,11 +37,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile); my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); my $test_nsiorfile = $test->LocalFile ($nsiorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator"); +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming"); +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"); my $ns_cmd = $NS->Executable(); my $ns_ns_cmd = $imr->LocalFile ($ns_cmd); diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl index 3d59f6fee81..6305ac82cdb 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl @@ -37,11 +37,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile); my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); my $test_nsiorfile = $test->LocalFile ($nsiorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator"); +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); -$NS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); my $ns_cmd = $NS->Executable(); my $ns_ns_cmd = $imr->LocalFile ($ns_cmd); diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl index fb17409ea59..55ac3efa24c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl @@ -99,7 +99,7 @@ $srvb->DeleteFile ($srvbiorfile); $cli->DeleteFile ($srvaiorfile); $ti->DeleteFile ($imriorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-ORBEndpoint "."$protocol"."://:".$port." ". "-UnregisterIfAddressReused $imr_debug". $ping_ext . @@ -149,7 +149,7 @@ if ($do_link == 1) { my $poaC = "AAA:" if ($srv_a_id =~ /AAA/); $poaC .= "poaC"; - $TI = $ti->CreateProcess ("../../../ImplRepo_Service/tao_imr", + $TI = $ti->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr", "-ORBInitRef ImplRepoService=file://$srva_imriorfile ". "add $poaA -c serverA"); if ($ti->PutFile ($imriorfile) == -1) { diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl index e630b7409b6..8b49865299c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl @@ -34,7 +34,7 @@ $ti->DeleteFile ($imriorfile); $imr->DeleteFile ($imrpfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index e2b374091aa..4d8262a770b 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -88,8 +88,8 @@ my $imr_host = $imr->HostName (); my $port = 12345; my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port; -my $IMR = $imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator"); -my $ACT = $act->CreateProcess ("../../ImplRepo_Service/tao_imr_activator"); +my $IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); +my $ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); my $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path @@ -100,7 +100,7 @@ $TI->IgnoreExeSubDir (1); my $replica_IMR; if ($replica) { - $replica_IMR = $replica_imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator"); + $replica_IMR = $replica_imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); } my @airplaneiorfile; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl index c2ee0a24296..e39fa13f470 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl @@ -56,7 +56,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl index 159b8472317..042757d4401 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl index bf273a45e39..b72b60c60ae 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl index d81cf930f94..44f21ca7a45 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl index 3af997650de..ad82c01980f 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl @@ -37,7 +37,7 @@ $client1->DeleteFile($ior1file); my $client2_ior1file = $client2->LocalFile ($ior1file); $client2->DeleteFile($ior1file); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_ior1file " . diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl index 4da354dd963..46f36675db1 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl @@ -47,7 +47,7 @@ $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl index 586b371c569..cd0c51ffaab 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl @@ -32,7 +32,7 @@ $server->DeleteFile($iorfile); my $client_iorfile = $client->LocalFile ($iorfile); $client->DeleteFile($iorfile); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_iorfile " . diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl index f6cc28cd300..802c492131b 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl @@ -22,7 +22,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); @@ -111,7 +111,7 @@ $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl index 0a7f917cbed..f1cc0540573 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl @@ -41,7 +41,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl index dac5d245efa..af717586ae6 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl @@ -33,7 +33,7 @@ sub idl_filenames { # Input: array of idl file names # Output: array of idl file names that had a failure sub phase1 { - my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/tao_ifr_service", + my $SVC = $ifr_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $ifr_service_iorfile"); my $CMP = $tao_ifr->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_ifr", diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl index 6c7548886aa..7682f579fef 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl @@ -15,7 +15,7 @@ if ($^O eq "MSWin32"){ $tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr"; } else{ - $tao_ifr = "../../../IFR_Service/tao_ifr"; + $tao_ifr = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr"; } my %isa = (); @@ -70,7 +70,7 @@ $test->DeleteFile ($log3); my $test_iorfile = $test->LocalFile ($iorbase); $test->DeleteFile($iorbase); -$SV1 = $test->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $test->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " -o $test_iorfile " . "-ORBLogFile $log1_test"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl index 8c541730246..b84f06d5826 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl @@ -48,7 +48,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl index d2fb1c0d254..43b31fc973e 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl @@ -42,7 +42,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl index 1e803108ed4..43e052a6cf2 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl @@ -41,7 +41,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl index f37a7c4382a..8b3b7c79dd4 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl @@ -37,7 +37,7 @@ $server->DeleteFile($iorbase); $server->DeleteFile($backing_file); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " -o $server_iorfile " . " $persistent"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl index 8bb7ccda4d7..a15fba38587 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl @@ -38,7 +38,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl index c012275fcf0..bd149ca55ea 100755 --- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", "-s -ORBInitRef NameService=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl index 1ef3e736f16..d284573bd71 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl @@ -43,7 +43,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . ($^O eq 'MSWin32' ? diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl index d3f640869e4..97413de3cd5 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl @@ -75,7 +75,7 @@ for $test (@tests) { $status = 0; #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log - $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", + $LM = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV1 = $server2->CreateProcess ("server", $test->{svr1_args}); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl index 97effd66342..e5538d843ed 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl @@ -88,7 +88,7 @@ for $test (@tests) { $status = 0; #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log - $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", + $LM = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV = $server2->CreateProcess ("server", $test->{svr_args}); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl index 9e6613ce73b..b4d079b788a 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl @@ -43,7 +43,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . ($^O eq 'MSWin32' ? diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl index 243e54741ab..d460b160627 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl @@ -24,7 +24,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-o $server_iorfile " . ($^O eq 'MSWin32' ? " -ORBSvcConf $lm_conf" : '')); diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl index 82fa6ab7197..a763424a80f 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl @@ -37,11 +37,11 @@ my $client_iorfile = $client->LocalFile ($iorfile); $client->DeleteFile($iorfile); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_iorfile"); -$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/tao_loadmonitor", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmonitor", "-ORBdebuglevel $debug_level " . "-l $location " . "-t CPU -s PULL " . diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl index b1b44318d6b..07d6a0fcd9f 100755 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl @@ -28,9 +28,9 @@ $ns_service->DeleteFile ($iorbase); $lg_service->DeleteFile ($iorbase); $client->DeleteFile ($iorbase); -$NS = $ns_service->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_iorfile"); -$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/tao_tls_basic", +$LS = $lg_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/tao_tls_basic", "-ORBInitRef NameService=file://$lg_iorfile"); $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index ff8a6305f95..fb38960eccc 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -90,7 +90,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); @@ -132,7 +132,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", + $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 261502d1c9a..1f699934ef0 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -87,7 +87,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); @@ -129,7 +129,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", + $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 9e0eb883efb..1e3905e547c 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index 87a1b5bfe70..78f6114cfeb 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl index 9d9bf4b1c71..d24e9a843cf 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl @@ -44,7 +44,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq '-p') { $consumer_runtime = 20; } -my $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "-NoNameSvc -IORoutput $nfs_nfsiorfile $svcconf " . "-ORBEndpoint iiop://$host:$port"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index d36c3bf08cf..91ae2a85513 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -47,10 +47,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://$ns_host:$ns_port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . @@ -204,7 +204,7 @@ $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); $nfs->DeleteFile ($nfsiorfile); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 27d3d6b9aad..46929f02acf 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -48,10 +48,10 @@ $sup->DeleteFile ($supiorfile); $con1->DeleteFile ($supiorfile); $con2->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl index 1e9e37a3217..e82f16e67a6 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl @@ -36,12 +36,12 @@ $server2->DeleteFile($ior2file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-ORBInitRef NameService=iioploc://$hostname:$port/NameService " . "-IORoutput $server2_ior2file " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl index c7abe1cb159..1ea1eacab1b 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl @@ -40,7 +40,7 @@ $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl index ca7373336bf..f67607d2a25 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl @@ -33,7 +33,7 @@ $server1->DeleteFile($ior1file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc -IORoutput $server1_ior1file $svcconf " . "-ORBEndpoint iiop://$hostname:$port"); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index c0e239cc85a..72ee2ef01ec 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -64,10 +64,10 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index c7e14a522e1..08fb3d48377 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -62,10 +62,10 @@ my $client2_client_ior = $client2->LocalFile ($client_ior); $client2->DeleteFile($ior1file); $client2->DeleteFile($client_ior); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$server2_ior1file " . "-IORoutput $server2_ior2file " . "-ORBSvcConf $server2_conf"); diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 59156e275f6..2c39fbdd1d8 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -85,9 +85,9 @@ if ($nfs->PutFile ($notify_conf) == -1) { exit 1; } -my $NS = $ns->CreateProcess("../../../Naming_Service/tao_cosnaming", +my $NS = $ns->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $nsiorfile"); -my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification", +my $NFS = $nfs->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "$nscorbaloc " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index d5cdcf52f29..c5bbbcf2552 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -67,10 +67,10 @@ $con->DeleteFile ($coniorfile); }, ); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". " -IORoutput $nfs_nfsiorfile"; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index b523c3fb0f9..b26025b89d4 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -64,10 +64,10 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl index ff53a833e79..bf443147f60 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl @@ -46,10 +46,10 @@ $nfs->DeleteFile ($nfsiorfile); $nfs->DeleteFile ($persistent_xml); $nfs->DeleteFile ($persistent_000); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBSvcConf $nfs_svc_conf -ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; $SUP = $sup->CreateProcess ("supplier"); diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl index d5e9d41db6b..4ea87556e05 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl @@ -49,10 +49,10 @@ $sup->DeleteFile ($nfs2iorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBEndpoint iiop://$nfs_host:$nfs_port " . "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 4ad2cb183b0..8c557aa1972 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -41,9 +41,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index e1a678e3550..d9b2fbadf98 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -41,9 +41,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index f954fae6858..3b6d2c1b6c7 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index efab347a441..7002b6aaf44 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index 4b0d2475da6..c6282c68e8b 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -50,10 +50,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index ef933ed7431..0795c8cce42 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -48,9 +48,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -my $NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +my $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification", +my $NFS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile -Timeout 750"); my $SUP = $ns->CreateProcess("Structured_Supplier", diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl index e4f0e68e05e..cfe55680976 100755 --- a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl @@ -38,7 +38,7 @@ $server->DeleteFile($iorbase); $client->DeleteFile ($persistent_file_xml); $client->DeleteFile ($persistent_file_000); -$SV = $server->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc " . "-IORoutput $server_iorfile " . diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index dadd213d8c1..3ffc40f87d4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -18,7 +18,6 @@ #include "ace/SString.h" #include "orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" -//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Service; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index c122595de2c..3c4198790f7 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -38,9 +38,9 @@ my $host = $nm_service->HostName(); my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService "; -$NS = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", +$NS = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior"); -$TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref. +$TS = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", $initref. "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf"); $STS = $supplier->CreateProcess ("Structured_Supplier", $initref. "-o $supplier_supplier_ior"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 2f0cea4b3d9..107472cd390 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -31,9 +31,9 @@ $nt_service->DeleteFile ($notify_ior); $nt_service->DeleteFile ($naming_ior); $test->DeleteFile ($naming_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile"); +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile"); $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile"); -$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", ""); +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ""); $nm_service_status = $NM_SV->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index 263d9cb476e..a20b3706fb3 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 9bf5f9060f8..0a4f35bb22c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl index 82bfb7dabf3..8f8b20e06d7 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl @@ -43,7 +43,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl index 10189c75ef2..8fdad5e9d79 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl @@ -43,7 +43,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl index 4467d13e858..a84c904a804 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl @@ -59,7 +59,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl index f3a665dcdd6..ab4dbab467a 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl @@ -59,7 +59,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl index a156aeec81f..1c84583868b 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl @@ -29,7 +29,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl index ef99e205c60..ee6a71ee02c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl @@ -31,7 +31,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index b539a56f25d..f58e0e09cc9 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 3746f296364..93777990d13 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index d5a41164e4e..f9b2b14509b 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -65,10 +65,10 @@ $nm_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nt_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level -o $nm_service_nm_ior"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nm_ior ". "-IORoutput $nt_service_nt_ior ". "-ORBSvcConf $nt_service_nt_conf ". diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index b45faeff8bf..889e1dfba12 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -80,9 +80,9 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf); $high_path_hpconffile = $high_path->LocalFile($high_path_conf); $other_path_opconffile = $other_path->LocalFile($other_paths_conf); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile $debug"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nmiorfile ". "-IORoutput $nt_service_ntiorfile ". "-ORBSvcConf $nt_service_ntconffile $debug"); diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index 33607e6c8a6..196bdb80bd7 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -32,7 +32,7 @@ $n_service->DeleteFile($iorbase); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ". "-ORBInitRef NameService=file://$server_iorfile"); $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile"); -$NS = $n_service->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $n_service_iorfile"); +$NS = $n_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $n_service_iorfile"); print STDERR "Starting tao_cosnaming\n"; diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index a2b3352b09b..dd74dc9300d 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -65,7 +65,7 @@ $cli->DeleteFile ($nsiorfile); sub name_server { my $args = "-ORBNameServicePort $ns_multicast_port -o $ns_nsiorfile -m 1 @_"; - my $prog = "../../../Naming_Service/tao_cosnaming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($prog, $args); $ns->DeleteFile ($nsiorfile); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl index f6ec6571e75..49299e5a180 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl @@ -37,7 +37,7 @@ $persistent_ior_file = "pns.ior"; my $test_iorfile = $test->LocalFile ($iorfile); my $test_persistent_ior_file = $test->LocalFile ($persistent_ior_file); -my $prog = "../../Naming_Service/tao_cosnaming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $test->DeleteFile($iorfile); $test->DeleteFile($persistent_ior_file); @@ -153,7 +153,7 @@ sub run_test $test->DeleteFile($iorfile); } -@server_exes = ("../../Naming_Service/tao_cosnaming", +@server_exes = ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"); foreach $e (@server_exes) { diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl index a04a4175f85..338a36acaaf 100755 --- a/TAO/orbsvcs/tests/Time/run_test.pl +++ b/TAO/orbsvcs/tests/Time/run_test.pl @@ -33,8 +33,8 @@ $clerk->DeleteFile($srv_ior); $clerk->DeleteFile($clk_ior); $client->DeleteFile($clk_ior); -$SV = $server->CreateProcess ("../../Time_Service/tao_costime_server", "-o $server_srv_ior"); -$CK = $server->CreateProcess ("../../Time_Service/tao_costime_clerk", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Time_Service/tao_costime_server", "-o $server_srv_ior"); +$CK = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Time_Service/tao_costime_clerk", "-f $clerk_srv_ior -o $clerk_clk_ior -t 2"); $CL = $client->CreateProcess ("client", "-f $client_clk_ior"); diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl index 0f4e1921ebb..dece4fd55a0 100755 --- a/TAO/orbsvcs/tests/Trading/run_test.pl +++ b/TAO/orbsvcs/tests/Trading/run_test.pl @@ -39,7 +39,7 @@ $import_test->DeleteFile($iorbase); my $export_ready_file = $export_test->LocalFile ($ready); $export_test->DeleteFile($ready); -$SV = $server->CreateProcess ("../../Trading_Service/tao_costrading", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Trading_Service/tao_costrading", "-ORBdebuglevel $debug_level ". "-ORBlogfile trader.log " . "-ORBEndpoint iiop://:$port " . -- cgit v1.2.1