summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-05-22 09:08:28 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2019-05-22 09:08:28 +0200
commit9e5d5794f5fd34d238d5222430ff70351e8c743a (patch)
treed55313d2821e6540a263bafeabf0358625ae71f7
parent96e5b38de38bf2937ed963499906594dcd156285 (diff)
downloadATCD-9e5d5794f5fd34d238d5222430ff70351e8c743a.tar.gz
List all FaultTolerant tests separately and removed the helper run_test.pl which is not required anymore
* TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl: Deleted. * TAO/bin/tao_other_tests.lst:
-rw-r--r--TAO/bin/tao_other_tests.lst5
-rwxr-xr-xTAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl44
2 files changed, 4 insertions, 45 deletions
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index b0ae4ded4ce..d88af4dd0e6 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -308,6 +308,9 @@ TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test
TAO/utils/nsgroup/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS !ST
TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
-TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
+TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
+TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
+TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
+TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl
deleted file mode 100755
index 56dc7e1c51a..00000000000
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
- & eval 'exec perl -S $0 $argv:q'
- if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-use Cwd;
-
-
-my @list=("run_failover_test.pl",
- "run_persistence_test.pl",
- "run_equivalence_test.pl",
- "run_backup_restart_test.pl");
-
-my $status = 0;
-
-my $debug_option = '';
-
-foreach $i (@ARGV) {
- if ($i eq '-debug') {
- $debug_option = '-debug';
- }
-}
-
-for $cmd (@list) {
- if (-f $cmd) {
- if (system ("perl $cmd $debug_option") != 0) {
- $status = 1;
- }
- } else {
- print STDERR "ERROR: Can't find $cmd\n";
- }
-}
-my $test_label = "FT_Naming FaultTolerant";
-
-if ($status != 0) {
- print STDERR "ERROR: One or more $test_label tests Failed\n";
-} else {
- print STDERR "INFO: All $test_label tests report OK\n";
-}
-
-exit $status;