diff options
| author | Steve Huston <shuston@riverace.com> | 2011-01-05 23:24:54 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2011-01-05 23:24:54 +0000 |
| commit | f68b2b565363ccad73f682ac05d856551965b53d (patch) | |
| tree | ccf76b702ce132100c897a3677d1bdbb89ef1b85 | |
| parent | 366fea6e36f0a545d50fe3e35c420a8f5637aecc (diff) | |
| download | ATCD-f68b2b565363ccad73f682ac05d856551965b53d.tar.gz | |
ChangeLogTag:Wed Jan 5 23:10:05 UTC 2011 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Bug_2610_Regression_Test.cpp | 36 |
2 files changed, 34 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 24020146156..e4491b8ff0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 5 23:10:05 UTC 2011 Steve Huston <shuston@riverace.com> + + * tests/Bug_2610_Regression_Test.cpp: Fixed a bunch of ACE_ERROR + statements to log the actual error cause; also fixed for IPv6. + Wed Jan 5 21:47:19 UTC 2011 Steve Huston <shuston@riverace.com> * tests/Bug_2609_Regression_Test.cpp: Carried over improvements to this diff --git a/tests/Bug_2610_Regression_Test.cpp b/tests/Bug_2610_Regression_Test.cpp index 648e90bf2d2..c31bff70921 100644 --- a/tests/Bug_2610_Regression_Test.cpp +++ b/tests/Bug_2610_Regression_Test.cpp @@ -111,7 +111,8 @@ struct My_Task : public ACE_Task_Base if (rv < 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT("Cannot run reactor event loop\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("Cannot run reactor event loop"))); } return 0; } @@ -146,10 +147,23 @@ run_main (int, ACE_TCHAR *[]) if (activated < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Could not activate task\n")), -1); + ACE_TEXT ("%p\n"), + ACE_TEXT ("Could not activate task")), + -1); } - ACE_INET_Addr a1(9000, "localhost"); + // Don't assume addr family of the listener - check and adapt when needed. + ACE_INET_Addr listen_addr; + acceptor.acceptor ().get_local_addr (listen_addr); +#if defined (ACE_HAS_IPV6) + const ACE_TCHAR *me = + listen_addr.get_type () == PF_INET ? ACE_LOCALHOST : ACE_IPV6_LOCALHOST; +#else + const ACE_TCHAR *me = ACE_LOCALHOST; +#endif /* ACE_HAS_IPV6 */ + ACE_INET_Addr a1 (listen_addr.get_port_number (), + me, + listen_addr.get_type ()); ACE_SOCK_Connector c1; g_semaphore.acquire();// wait for reactor to start @@ -158,7 +172,10 @@ run_main (int, ACE_TCHAR *[]) ACE_SOCK_Stream s1; if (-1 == c1.connect (s1, a1)) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Could not connect\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("Could not connect")), + -1); } g_semaphore.acquire(); // wait for accept_svc_handler() to start } @@ -167,7 +184,10 @@ run_main (int, ACE_TCHAR *[]) ACE_SOCK_Stream s1; if (-1 == c1.connect (s1, a1)) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Could not connect\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("Could not connect")), + -1); } g_semaphore.acquire(); // wait for activate_svc_handler to complete } @@ -185,8 +205,10 @@ run_main (int, ACE_TCHAR *[]) if (g_svc_handlers_leaked != 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("Svc_Handler leakage detected, %d objects\n")), - g_svc_handlers_leaked); + ACE_TEXT ("Svc_Handler leakage detected, ") + ACE_TEXT ("%d objects remain\n"), + g_svc_handlers_leaked), + 1); } #else ACE_ERROR ((LM_INFO, |