diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 12:18:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 12:18:12 +0000 |
| commit | b9289c30582ab000d857f8fca8e3c03be5de21ca (patch) | |
| tree | 93a8103f4d3194fe79e45f79221da2acd3e63324 /ACE/tests/test_config.h | |
| parent | f2494f9a571dc35f3bd4d4a1282a5f277668e794 (diff) | |
| download | ATCD-b9289c30582ab000d857f8fca8e3c03be5de21ca.tar.gz | |
Fri May 1 12:19:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/INET_Addr_Test_IPV6.cpp:
No need for ACE_UNUSED_ARG
* tests/Map_Manager_Test.cpp:
Use ACE_TEST_ASSERT and added some more checks
* tests/test_config.h:
Removed ghs workaround and check return value of log_msg open
call
Diffstat (limited to 'ACE/tests/test_config.h')
| -rw-r--r-- | ACE/tests/test_config.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index 71923ea293c..c939cb148bd 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -77,7 +77,8 @@ size_t const ACE_MAX_THREADS = 4; #ifndef ACE_START_TEST #define ACE_START_TEST(NAME) \ const ACE_TCHAR *program = NAME; \ - ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE); \ + if (ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE) != 0) \ + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open log_msg failed")), -1); \ if (ace_file_stream::instance()->set_output (program) != 0) \ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program)) @@ -93,7 +94,8 @@ size_t const ACE_MAX_THREADS = 4; #define ACE_APPEND_LOG(NAME) \ const ACE_TCHAR *program = NAME; \ - ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE); \ + if (ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE) != 0) \ + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open log_msg failed")), -1); \ if (ace_file_stream::instance()->set_output (program, 1) != 0) \ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program)); @@ -125,11 +127,6 @@ size_t const ACE_MAX_THREADS = 4; ACE_OS::unlink (temp); \ } -#if defined (ghs) -# // Rename main to ace_main for compatibility with run_tests.vxworks. -# undef ACE_MAIN -# define ACE_MAIN ace_main -#endif /* ghs */ #else /* ! VXWORKS */ # if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) # define ACE_INIT_LOG_FMT ACE_TEXT ("%ls%ls%ls") |