diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-05-23 08:13:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 08:13:25 +0200 |
| commit | a580273d5fc7a820ab23b1aa40faf23e97063000 (patch) | |
| tree | 76814e85206a8c30a71643ca72cfee25f6d1bc40 | |
| parent | fb73b217820cef92a469cd31045e479d4d776c7d (diff) | |
| parent | d4dc5874ea9c94d2248b16ebe8535bfc654c0376 (diff) | |
| download | ATCD-a580273d5fc7a820ab23b1aa40faf23e97063000.tar.gz | |
Merge pull request #910 from jwillemsen/jwi-simplenaming
Fix simple_naming test by using a full path based on TAO_ROOT
| -rw-r--r-- | ACE/tests/Log_Msg_Backend_Test.cpp | 3 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Simple_Naming/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp index 1f9ec350bf9..d4579da6044 100644 --- a/ACE/tests/Log_Msg_Backend_Test.cpp +++ b/ACE/tests/Log_Msg_Backend_Test.cpp @@ -11,15 +11,12 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Log_Msg.h" #include "ace/Log_Msg_Backend.h" #include "ace/Log_Record.h" - - class Backend : public ACE_Log_Msg_Backend { public: diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index 097cac7e92d..3b2bc6044b6 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -96,7 +96,7 @@ sub name_server sub client { my $args = "@_"." "; - my $prog = "client"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/tests/Simple_Naming/client"; $CL = $test->CreateProcess ("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl index 6d387aa9b5c..9dfb7c9f25d 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl @@ -95,7 +95,6 @@ sub client print STDERR "ERROR: client returned $client_status\n"; $status = 1; } - } ## The options below have been reordered due to a |