diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-11 17:35:38 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-11 17:35:38 +0000 |
| commit | c0c6c0a7f8c15dcbeba272e92a8e50eb0747345f (patch) | |
| tree | 123b85d058a5e275a8d857e2c5d3e74d27386846 | |
| parent | 682c3b2eb83b636ace106087c3fd07853713cf15 (diff) | |
| download | ATCD-c0c6c0a7f8c15dcbeba272e92a8e50eb0747345f.tar.gz | |
Thu Jan 11 17:13:56 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/tests/Oneway_Timeouts/client.cpp | 32 |
2 files changed, 27 insertions, 18 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 44ebb1a61a9..eb8ccd29547 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Thu Jan 11 17:13:56 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Oneway_Timeouts/client.cpp: + + Changed test failure criteria so that a missed deadline is no + longer considered a failure. The errors due to missed deadlines + are spurious on systems using preemptive multitasking because + there is no way to control the additional delay imposed by the + operating system. The test for exception delivery time is beside + the point for this test anyway; we want to test that an + exception occurs or does not occur, not when it happens to + occur. + Wed Jan 10 21:47:39 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> * docs/INS.html: diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 75a7042094e..f5d7d5c77fc 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -379,10 +379,9 @@ int main (int ac, char *av[]) if (max_request_time > 0 && (after - before).msec () > max_request_time) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: test() took %d ms, max is %d ms\n", - (after - before).msec (), max_request_time), - 1); + ACE_DEBUG ((LM_DEBUG, + "note: test() took %d ms, max is %d ms\n", + (after - before).msec (), max_request_time)); } ACE_DEBUG ((LM_DEBUG, "c%d\n", i)); @@ -464,9 +463,8 @@ int main (int ac, char *av[]) { if (ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Buffered request took %dms\n", - ms),1); + ACE_DEBUG ((LM_DEBUG, + "note: Buffered request took %dms\n", ms)); } ms = num_requests_sent * request_interval; @@ -475,10 +473,9 @@ int main (int ac, char *av[]) if (ms - connect_timeout > TIME_THRESHOLD || connect_timeout - ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Timeout expected in %d ms, " - "but took %d ms\n", connect_timeout, ms), - 1); + ACE_DEBUG ((LM_DEBUG, + "note: Timeout expected in %d ms, " + "but took %d ms\n", connect_timeout, ms)); } return 0; @@ -505,9 +502,9 @@ int main (int ac, char *av[]) { if (ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Buffered request took %d ms\n", - ms),1); + ACE_DEBUG ((LM_DEBUG, + "note: Buffered request took %d ms\n", + ms)); } ms = num_requests_sent * request_interval; @@ -516,10 +513,9 @@ int main (int ac, char *av[]) if (ms - connect_timeout > TIME_THRESHOLD || connect_timeout - ms > TIME_THRESHOLD) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Timeout expected in %d ms, " - "but took %d ms\n", connect_timeout, ms), - 1); + ACE_DEBUG ((LM_DEBUG, + "note: Timeout expected in %d ms, " + "but took %d ms\n", connect_timeout, ms)); } return 0; |