diff options
author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
---|---|---|
committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
commit | 5e030faf84086ab02059fcbcc3faed224bd57b95 (patch) | |
tree | 3a62df45ac6ccf599fb07cf6a03d672456ce2e3d /TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl | |
parent | 9d296f7fa51116ff7040ecb2ad18612cd94b5fd1 (diff) | |
download | ATCD-5e030faf84086ab02059fcbcc3faed224bd57b95.tar.gz |
Merge in OCI_Reliability_Enhancements branch.
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl')
-rwxr-xr-x | TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl | 31 |
1 files changed, 1 insertions, 30 deletions
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. |