diff options
Diffstat (limited to 'tests/Logging_Strategy_Test.cpp')
| -rw-r--r-- | tests/Logging_Strategy_Test.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index 90cdb112936..3cf371e4764 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -449,7 +449,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) // though, and you may activate the logging strategy as described in // the non-DLL section below under DLL environments as well. -#if !defined (ACE_AS_STATIC_LIBS) && \ +#if !defined (ACE_HAS_STATIC_LIBS) && \ (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ defined (__hpux)) // Platform support DLLs, and not configured to link statically @@ -485,7 +485,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) ((LM_ERROR, "Error initializing the ACE_Logging_Strategy.\n"), 1); -#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 || +#endif /* !ACE_HAS_STATIC_LIBS && (ACE_WIN32 || ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */ // launch a new Thread @@ -506,6 +506,15 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Wait for the thread to exit before we exit. ACE_Thread_Manager::instance ()->wait (); + +#if !defined (ACE_HAS_STATIC_LIBS) && \ + (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ + defined (__hpux)) + // This insures that all messages get written to the log. + ACE_Service_Config::process_directive (ACE_TEXT ("remove Logger")); +#endif /* !ACE_HAS_STATIC_LIBS && (ACE_WIN32 || ACE_HAS_SVR4_DYNAMIC_LINKING + || __hpux) */ + ACE_END_TEST; return 0; } |