diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-05-21 08:16:15 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-05-21 08:16:15 +0200 |
commit | 37c0f08472a27b839713a052524136f7915c8fad (patch) | |
tree | 8e74cd1fcc183a3e060e58e15fe7cc16b43ebbec | |
parent | 92c88990852cbbc383943be050d957746a620b09 (diff) | |
download | ATCD-37c0f08472a27b839713a052524136f7915c8fad.tar.gz |
Adapt these test scripts in order to let them work with an arch subdir set
* 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:
5 files changed, 23 insertions, 28 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 c650bee8b59..8faece44fc8 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,8 +314,7 @@ sub backup_restart_test() "-r $name_dir ". "-v $group_dir"; - my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; - + my $tao_ft_naming = "$startdir/../../../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 bb853f187bb..ed4d2416a01 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 = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; + my $tao_ft_naming = "$startdir/../../../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 82ad0816ca5..bc1f6f41ff6 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 = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; + my $tao_ft_naming = "$startdir/../../../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 c8c4fe9dccf..15d173dbf2b 100755 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl @@ -23,15 +23,12 @@ foreach $i (@ARGV) { if ($i eq '-verbose') { $redirection_enabled = 0; } - } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $server2 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; - - # Variables for command-line arguments to client and server # executables. @@ -95,12 +92,12 @@ sub compare_file_with_backup($) my $file = shift; my $backup = $file . ".bak"; unless (-e $backup) { - print STDERR "ERROR: Backup file $backup does not exist\n"; - return 1; + print STDERR "ERROR: Backup file $backup does not exist\n"; + return 1; } my $result = compare ($file, $backup); if ($result != 0) { - print STDERR "ERROR: Backup file $backup does not agree with $file\n"; + print STDERR "ERROR: Backup file $backup does not agree with $file\n"; } return $result; } @@ -318,7 +315,7 @@ sub persistence_test () "-v $group_dir ". "-u $name_dir "; - my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; + my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; my $client1_args = "--persistence " . "--create " . @@ -460,7 +457,7 @@ sub backup_restore_test () "-v $group_dir ". "-u $name_dir "; - my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; + my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; my $client1_args = "--persistence " . "--create " . @@ -537,25 +534,25 @@ sub backup_restore_test () print_msg("Verifying naming context backup files"); $file = $name_dir . "/NameService"; if (compare_file_with_backup ($file) != 0) { - $status = 1; + $status = 1; } for ($i = 0; $i < $num_child_contexts; $i++) { - $file = $name_dir . "/NameService_$i"; - if (compare_file_with_backup ($file) != 0) { - $status = 1; - } + $file = $name_dir . "/NameService_$i"; + if (compare_file_with_backup ($file) != 0) { + $status = 1; + } } print_msg("Verifying object group backup files"); $file = $group_dir . "/ObjectGroup_global"; if (compare_file_with_backup ($file) != 0) { - $status = 1; + $status = 1; } for ($i = 0; $i < $num_object_groups; $i++) { - $file = $group_dir . "/ObjectGroup_$i"; - if (compare_file_with_backup ($file) != 0) { - $status = 1; - } + $file = $group_dir . "/ObjectGroup_$i"; + if (compare_file_with_backup ($file) != 0) { + $status = 1; + } } ##6. Replace some of the data files with corrupt files @@ -567,7 +564,7 @@ sub backup_restore_test () @allfiles = grep(/^NameService/, readdir(NAMEDIR)); closedir(NAMEDIR); foreach $file (@allfiles) { - copy ($corrupt_name_dir . $file, $name_dir . "/" . $file) or die "Copy failed: $!\n"; + copy ($corrupt_name_dir . $file, $name_dir . "/" . $file) or die "Copy failed: $!\n"; } my $corrupt_group_dir = $corrupt_data_dir . $group_dir . "/"; @@ -575,7 +572,7 @@ sub backup_restore_test () @allfiles = grep(/^ObjectGroup/, readdir(GROUPDIR)); closedir(GROUPDIR); foreach $file (@allfiles) { - copy ($corrupt_group_dir . $file, $group_dir . "/" . $file) or die "Copy failed: $!\n"; + copy ($corrupt_group_dir . $file, $group_dir . "/" . $file) or die "Copy failed: $!\n"; } ##7. Start a new instance of the tao_ft_naming server @@ -606,8 +603,8 @@ sub backup_restore_test () } if ($restore_status == 1) { - cat_file($client_stderr_file); - cat_file($client_stdout_file); + cat_file($client_stderr_file); + cat_file($client_stdout_file); } print_msg("INFO: terminating test server"); diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl index ad43caf54c3..9dd48293918 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl @@ -55,7 +55,6 @@ sub init_naming_context_directory($$) } } - # Variables for command-line arguments to client and server # executables. my $ns_orb_primary_port1 = 9931; @@ -92,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 = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; +my $tao_ft_naming = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; my $name_dir1 = "NameService1"; my $name_dir2 = "NameService2"; |