diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 14:57:43 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 14:57:43 +0000 |
| commit | ddb364e4c9719b77b77be0c1882f5701da59987d (patch) | |
| tree | fbf365e48f85ee6dbff24a08a89cc5d41c416b92 | |
| parent | 6d6157eae98f92bf87d4c3dd679545690ad7f44c (diff) | |
| download | ATCD-ddb364e4c9719b77b77be0c1882f5701da59987d.tar.gz | |
Thu Oct 29 14:56:17 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tests/Bug_3748_Regression/client.cpp:
* tests/Bug_3748_Regression/server.cpp:
* tests/Bug_3748_Regression/run_test.pl:
Temporarily made the output a bit more verbose.
| -rw-r--r-- | TAO/ChangeLog | 15 | ||||
| -rw-r--r-- | TAO/tests/Bug_3748_Regression/client.cpp | 2 | ||||
| -rwxr-xr-x | TAO/tests/Bug_3748_Regression/run_test.pl | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_3748_Regression/server.cpp | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8a4e321aa3f..b8974e31202 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Oct 29 14:56:17 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tests/Bug_3748_Regression/client.cpp: + * tests/Bug_3748_Regression/server.cpp: + * tests/Bug_3748_Regression/run_test.pl: + Temporarily made the output a bit more verbose. + Thu Oct 29 02:12:40 UTC 2009 Yan Dai <dai_y@ociweb.com> * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: @@ -69,8 +76,8 @@ Wed Oct 28 23:27:02 UTC 2009 Yan Dai <dai_y@ociweb.com> * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp: * tao/Monitor/Monitor_Types.pidl: - Merged following changes from OCI made between 1.5a p15 and p16 releases. - + Merged following changes from OCI made between 1.5a p15 and p16 releases. + - Added consumer-level queueing statistics to the Notification Service MC. - Added queue-overflow statistics to the Notification Service MC. - Modified Notification Service MC to work in static builds. @@ -79,8 +86,8 @@ Wed Oct 28 23:27:02 UTC 2009 Yan Dai <dai_y@ociweb.com> - QueueDepth have been changed to measure the number of entries rather than attempting unsuccessfully to estimate the amount of memory used by the queue. - Added TAO_EXPLICIT_NEGOTIATE_CODESETS macro to improve the ease of including - optional codeset support to Notify_Service in static builds. - + optional codeset support to Notify_Service in static builds. + Wed Oct 28 06:09:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_other_tests.lst: diff --git a/TAO/tests/Bug_3748_Regression/client.cpp b/TAO/tests/Bug_3748_Regression/client.cpp index e99a5609346..96b9ce71fb6 100644 --- a/TAO/tests/Bug_3748_Regression/client.cpp +++ b/TAO/tests/Bug_3748_Regression/client.cpp @@ -72,7 +72,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { if (++encountered_failures % 500 == 0) { -#if 0 +#if 1 ACE_DEBUG ((LM_DEBUG, "Expected exception\n")); #endif diff --git a/TAO/tests/Bug_3748_Regression/run_test.pl b/TAO/tests/Bug_3748_Regression/run_test.pl index 3bb167be7ca..654e35f9ca4 100755 --- a/TAO/tests/Bug_3748_Regression/run_test.pl +++ b/TAO/tests/Bug_3748_Regression/run_test.pl @@ -9,7 +9,7 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; $status = 0; -$debug_level = '0'; +$debug_level = '1'; foreach $i (@ARGV) { if ($i eq '-debug') { diff --git a/TAO/tests/Bug_3748_Regression/server.cpp b/TAO/tests/Bug_3748_Regression/server.cpp index c63c19b2539..913ba8f85d5 100644 --- a/TAO/tests/Bug_3748_Regression/server.cpp +++ b/TAO/tests/Bug_3748_Regression/server.cpp @@ -180,7 +180,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager::instance ()); if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 1) == -1) { - ACE_ERROR ((LM_ERROR, "Error activating server task\n")); + ACE_ERROR_RETURN ((LM_ERROR, + "Error activating server task\n"), + 1); } orb->run (); |