diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-05 17:13:18 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-05 17:13:18 +0000 |
| commit | a146f489e6b9eecb87a944edc6da13409764b1a8 (patch) | |
| tree | 3d3c432e4b9655f5f36e1edce618466bdb38b6c7 | |
| parent | d37537421c6c8adf71de0e88f080282fffbfd4ee (diff) | |
| download | ATCD-a146f489e6b9eecb87a944edc6da13409764b1a8.tar.gz | |
ChangeLogTag: Fri Jan 5 17:09:35 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rwxr-xr-x | TAO/tests/Portable_Interceptors/Redirection/run_test.pl | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a41592794ba..190e7a6cd8b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Jan 5 17:09:35 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/Portable_Interceptors/Redirection/run_test.pl: + + The sudden death of the first server is expected and is part of + the test. Changing the script to interpret the event + accordingly. + Fri Jan 5 15:37:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/AnyTypeCode/DynamicC.h: diff --git a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl index eac7bdbd3bc..024921a57cd 100755 --- a/TAO/tests/Portable_Interceptors/Redirection/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Redirection/run_test.pl @@ -48,9 +48,18 @@ if ($client != 0) { $server1 = $SV1->WaitKill (5); +# The first server will crash by design and in such instance it will +# return the magic number 1. The test must not interpret it as an +# error. + if ($server1 != 0) { - print STDERR "ERROR: server1 returned $server1\n"; - $status = 1; + if ($server1 != 1) { + print STDERR "ERROR: server1 returned $server1\n"; + $status = 1; + } + else { + print STDERR "INFO: server1 commited suicide as expected\n"; + } } $server2 = $SV2->WaitKill (5); |