Use more TAO_ROOT as environment for a path, using startdir will not work correctly in a cross platform setup

    * TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl:
    * TAO/orbsvcs/tests/Redundant_Naming/run_test.pl:
    * TAO/orbsvcs/tests/Simple_Naming/run_test.pl:
    * TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl:

9 files changed, 13 insertions, 23 deletions

diff --git a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
index 95a852b7261..bcacbfc357a 100755
--- a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl
@@ -10,7 +10,6 @@ use Cwd;
 
 ## Save the starting directory
 $status = 0;
-$startdir = getcwd();
 
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
@@ -47,7 +46,7 @@ sub cleanup
 sub start_name_server
 {
     my $args = "-ORBCollocation no -ORBListenEndpoints iiop://$hostname:$ns_orb_port -o $test_iorfile -n 5 -u $persistence_dir";
-    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
+    my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
     $SV->Spawn ();
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
index c7d9a17bc79..35a091190ab 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl
@@ -10,7 +10,6 @@ use Cwd;
 
 #$ENV{ACE_TEST_VERBOSE} = "1";
 
-my $startdir = getcwd();
 my $debug_level = '0';
 my $redirection_enabled = 0;
 
@@ -322,7 +321,7 @@ sub backup_restart_test()
                       "-b 4 " .
                       "-d 4 " ;
 
-    my $client_prog = "$startdir/client";
+    my $client_prog = "client";
 
     $NS1 = $server->CreateProcess ($tao_ft_naming, $ns1_args);
     $NS2 = $server->CreateProcess ($tao_ft_naming, $ns2_args);
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
index bb853f187bb..b0f95402aef 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
@@ -10,7 +10,6 @@ use Cwd;
 
 #$ENV{ACE_TEST_VERBOSE} = "1";
 
-my $startdir = getcwd();
 my $debug_level = '0';
 my $redirection_enabled = 0;
 
@@ -344,8 +343,7 @@ sub redundant_equivalency_test()
                       "-b 4 " .
                       "-d 4 ";
 
-    my $client_prog = "$startdir/client";
-
+    my $client_prog = "client";
 
     $NS1 = $server->CreateProcess ($tao_ft_naming, $ns1_args);
     $NS2 = $server->CreateProcess ($tao_ft_naming, $ns2_args);
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
index 82ad0816ca5..8ae1cd596a1 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -10,7 +10,6 @@ use Cwd;
 
 #$ENV{ACE_TEST_VERBOSE} = "1";
 
-my $startdir = getcwd();
 my $debug_level = '0';
 my $redirection_enabled = 0;
 
@@ -322,7 +321,7 @@ sub failover_test()
                       "-b 4 " .
                       "-d 4 " ;
 
-    my $client_prog = "$startdir/client";
+    my $client_prog = "client";
 
     print STDERR "$tao_ft_naming $ns1_args\n";
     print STDERR "$tao_ft_naming $ns2_args\n";
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
index ef0c85bc626..412edf8d760 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
@@ -13,7 +13,6 @@ use Cwd;
 
 $status = 0;
 $debug_level = '0';
-$startdir = getcwd();
 
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index 3a7decb5e7f..f9cc8fd812f 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -11,8 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 use Cwd;
 
-$startdir = getcwd();
-
 $quiet = 0;
 
 # check for -q flag
@@ -139,7 +137,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " .
 
 $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
-print STDERR "Starting Backup: $prog $args\n in $startdir\n";
+print STDERR "Starting Backup: $prog $args\n\n";
 
 $NS2 = $test->CreateProcess ("$prog", "$args");
 
@@ -162,7 +160,7 @@ $args = "-p corbaloc:iiop:$hostname:$ns_orb_port1/NameService " .
         "-b 4 " .
         "-d 4 " .
         "-t 100";
-$prog = "$startdir/client";
+$prog = "client";
 
 print STDERR "Starting Client: $prog $args\n";
 
@@ -186,7 +184,7 @@ $NS1->Kill ();
 
 print STDERR "Printing Naming Tree from combined Name Service pair.\n";
 
-$prog = "$startdir/../../../../utils/nslist/tao_nslist";
+$prog = "$ENV{TAO_ROOT}/utils/nslist/tao_nslist";
 $args = "--ns file://$combined_ns_iorfile";
 
 $NSL = $test->CreateProcess("$prog", "$args");
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
index fb4e72fbf63..0dd7bbd4cb9 100755
--- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -11,8 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
 use Cwd;
 
-$startdir = getcwd();
-
 $quiet = 0;
 
 # check for -q flag
@@ -77,7 +75,7 @@ else {
 # in files to find the individual copies of the Naming Servers.
 
 my $args = "-ORBEndPoint $ns_endpoint1 -o $iorfile1 -m 0 -r NameService";
-my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
+my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 
 $NS1 = $test->CreateProcess ("$prog", "$args");
 
@@ -93,7 +91,7 @@ if ($test->WaitForFileTimed ($iorfile1,
 }
 
 $args = "-ORBEndPoint $ns_endpoint2 -o $test_iorfile2 -m 0 -r NameService";
-$prog = "$startdir/../../Naming_Service/tao_cosnaming";
+$prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 
 $NS2 = $test->CreateProcess ("$prog", "$args");
 
@@ -114,7 +112,7 @@ if ($test->WaitForFileTimed ($iorfile2,
 sleep(1);
 
 $args = "-p file://$test_iorfile1 -q file://$test_iorfile2";
-$prog = "$startdir/client";
+$prog = "client";
 
 $CL = $test->CreateProcess ("$prog", "$args");
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index f446b8ad818..097cac7e92d 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -75,7 +75,7 @@ $test->DeleteFile($persistent_log_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
+    my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");
 
@@ -96,7 +96,7 @@ sub name_server
 sub client
 {
     my $args = "@_"." ";
-    my $prog = "$startdir/client";
+    my $prog = "client";
 
     $CL = $test->CreateProcess ("$prog", "$args");
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index 6d197fcb7ac..6d387aa9b5c 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -66,7 +66,7 @@ $test->DeleteFile($persistent_ior_file);
 sub name_server
 {
     my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/tao_cosnaming";
+    my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 
     $SV = $test->CreateProcess ("$prog", "$args");