diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-31 19:17:13 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-31 19:17:13 +0000 |
| commit | eead2ef25c54a58d7adee69cabfbd6c37d40a71d (patch) | |
| tree | 00b93df8c82922c2811897887640b8903bf459a0 | |
| parent | 27cba79aae8a36fe44b3013223731092484c84c6 (diff) | |
| download | ATCD-eead2ef25c54a58d7adee69cabfbd6c37d40a71d.tar.gz | |
Avoid running Redundant_Naming test on unsupported windows. Fix issue in
test for Windows when TAO is not in the $ACE_ROOT path.
| -rw-r--r-- | TAO/OCI_RE_ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/bin/tao_other_tests.lst | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl | 31 |
3 files changed, 12 insertions, 31 deletions
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog index 5ddf53012c3..868010b0db7 100644 --- a/TAO/OCI_RE_ChangeLog +++ b/TAO/OCI_RE_ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 31 19:12:02 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> + + * bin/tao_other_tests.lst: + + Avoid running Redundant_Naming test on Windows. Not supported on that platform. + + * orbsvcs/tests/Bug_2777_Regression/run_test.pl: + + Run tao_nslist from $ACE_ROOT/bin instead of searching for it. + Thu Jan 31 15:59:23 UTC 2013 Byron Harris <harrisb@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 2699c01356d..de37153cab0 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -82,7 +82,7 @@ TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: !NO_UUID !STATIC !MINIMUM !CO TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl: !Win32 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED -TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISTRIBUTED +TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !Win32 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISTRIBUTED TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl: !CORBA_E_MICRO TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO diff --git a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl index 60fbbfbcf21..e6bfe97b362 100755 --- a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl @@ -17,36 +17,7 @@ foreach $i (@ARGV) { } } -my $exec_extn = ""; -if ($^O eq "MSWin32") { - $exec_extn = ".exe"; -} - -my @nslist_paths = (["../../../../bin", ""], - ["../../../bin", ""], - ["../../../../TAO/utils/nslist", ""]); -if (grep(($_ eq 'ARCH'), @PerlACE::ConfigList::Configs)) { - push @nslist_paths, ["../../../../bin/" . $PerlACE::Process::ExeSubDir, - "../../../../bin"]; -} - -my $nslist_path = ""; -for my $p (@nslist_paths) { - my $use_path = ($p->[1] eq "") ? $p->[0] : $p->[1]; - if (-e $p->[0] . '/tao_nslist') { - $nslist_path = $use_path . '/tao_nslist'; - last; - } - if ($exec_extn ne "" && -e $p->[0] . '/tao_nslist' . $exec_extn) { - $nslist_path = $use_path . '/tao_nslist'; - last; - } -} - -if ($nslist_path eq "") { - print STDERR "ERROR: tao_nslist utility not found.\n"; - exit 1; -} +my $nslist_path = "$ENV{ACE_ROOT}/bin/tao_nslist"; ## The two test targets will communicate over shared memory (SHMIOP) so they ## can't be 32-bit and 64-bit executables on the same host. |