diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-01 14:19:29 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-01 14:19:29 +0000 |
| commit | 16ee5d71e3d5f429b8acbdc13c3f024ce2ea0b9d (patch) | |
| tree | a299625fe9eced093b85bee16ab8ac9d9302e72b | |
| parent | 003165c45426c692293ab4696b3636267bd2570c (diff) | |
| download | ATCD-16ee5d71e3d5f429b8acbdc13c3f024ce2ea0b9d.tar.gz | |
Wed May 1 14:16:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e09608c2792..4637326ab77 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed May 1 14:16:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Clear the result returned by the tao_imr when it is expected to return a + non-zero value. + Wed May 1 13:32:09 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl index e9779387143..5a9207033bb 100755 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl @@ -372,6 +372,11 @@ sub run_imr_start_test $result = run_imr_util ("start $obj[1]"); + if ($hide_server == 1 && $result == 4) { + print_msg ("SUCCESS: tao_imr start $obj[1] returned $result\n"); + $result = 0 + } + $result |= fini_test (); return $result; |