Use TAO_ROOT for tao_ft_naming

    * 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/FaultTolerant/run_persistence_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl:
    * TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl:
    * TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl:
    * TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl:

10 files changed, 13 insertions, 13 deletions

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 8faece44fc8..c7d9a17bc79 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
@@ -314,7 +314,7 @@ sub backup_restart_test()
                    "-r $name_dir ".
                    "-v $group_dir";
 
-    my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
     my $client_args = "--failover " .
                       "-ORBDebugLevel $debug_level " .
                       "-p file://$server_ns_iorfile " .
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 ed4d2416a01..bb853f187bb 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
@@ -314,7 +314,7 @@ sub redundant_equivalency_test()
     my $client_stdout_file        = $client->LocalFile ($stdout_file);
     my $client_stderr_file        = $client->LocalFile ($stderr_file);
 
-    my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
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 bc1f6f41ff6..82ad0816ca5 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -313,7 +313,7 @@ sub failover_test()
                    "-r $name_dir ".
                    "-v $group_dir";
 
-    my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client_args = "--failover " .
                       "-ORBDebugLevel $debug_level " .
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index ef40558c515..134f9d7b8d9 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -315,7 +315,7 @@ sub persistence_test ()
                         "-v $group_dir ".
                         "-u $name_dir ";
 
-    my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client1_args = "--persistence " .
                        "--create " .
@@ -457,7 +457,7 @@ sub backup_restore_test ()
                         "-v $group_dir ".
                         "-u $name_dir ";
 
-    my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client1_args = "--persistence " .
                        "--create " .
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
index 9dd48293918..622752897bd 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
@@ -91,7 +91,7 @@ $ns2->DeleteFile ($ns2_ior);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level");
 
-my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 my $name_dir1 = "NameService1";
 my $name_dir2 = "NameService2";
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 8a0585241d9..ef0c85bc626 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
@@ -92,7 +92,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " .
     "-r $naming_persistence_dir " .
     "-v $groups_persistence_dir " .
     "--primary";
-my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Primary: $prog $args\n";
 
@@ -121,7 +121,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " .
         "-v $groups_persistence_dir " .
         "--backup";
 
-$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+$prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Backup: $prog $args\n";
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index d4ba7ec0499..3a7decb5e7f 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -106,7 +106,7 @@ my $args = "-orbdebuglevel 1 -orbverboselogging 1 -ORBLogFile primary.log -ORBEn
            "-v $groups_persistence_dir " .
            "-n 100 " .
            "--primary";
-my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Primary: $prog $args\n";
 
@@ -137,7 +137,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " .
         "-orbdebuglevel 1 -orbverboselogging 1  -ORBLogFile backup.log " .
         "--backup";
 
-$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+$prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Backup: $prog $args\n in $startdir\n";
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl
index 72972f1f213..548d738be66 100755
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl
@@ -125,7 +125,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " .
     "-o $ns_iorfile -h $nm_iorfile " .
     "-ORBDebuglevel $debug_level -ORBVerboseLogging 1 -ORBLogFile $primary_logfile ";
 
-my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
+my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Primary: $prog $args\n";
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index 3e27dd7b652..f6ec6571e75 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -154,7 +154,7 @@ sub run_test
 }
 
 @server_exes = ("../../Naming_Service/tao_cosnaming",
-                "../../FT_Naming_Service/tao_ft_naming");
+                "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming");
 
 foreach $e (@server_exes) {
     print STDERR "Testing Naming Service Executable: $e\n";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
index 9e62c2e1141..3b4ce6bede2 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
@@ -66,7 +66,7 @@ $test->DeleteFile($persistent_log_file);
 sub name_server
 {
     my $args = "-u NameService -ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../FT_Naming_Service/tao_ft_naming";
+    my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     $SV = $test->CreateProcess ("$prog", "$args");