(ACE_END_TEST): removed sleep hack with threading because it's not needed with Nanbor's Thread_Manager fix

1 files changed, 1 insertions, 16 deletions

diff --git a/tests/test_config.h b/tests/test_config.h
index 98458c08080..dc33f18e987 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -106,24 +106,9 @@ typedef size_t KEY;
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting %s test at %T\n", program));
 
-#if defined (ACE_HAS_THREADS)
-  // Give all threads a chance to terminate gracefully.  This
-  // shouldn't be necessary, but see the comment in
-  // ACE_Thread_Manager::wait ().  The problem arises because the
-  // threads that signalled the ACE_Thread_Manager may not have had a
-  // chance to run after that, and therefore may not have finished
-  // cleaning themselves up.  This hack does seem to avoid this
-  // occasional anomaly in tests/Buffer_Stream_Test:
-  // ACE_ASSERT: file /project/merengue/levine/ACE_wrappers/build/SunOS5_sunc++/ace/Module.cpp, line 230 assertion failed for 'task->thr_count () == 0'.
-# define ACE_DELAY_FOR_THREAD_TERMINATION ACE_OS::sleep (1);
-#else  /* ! ACE_HAS_THREADS */
-# define ACE_DELAY_FOR_THREAD_TERMINATION
-#endif /* ! ACE_HAS_THREADS */
-
 #define ACE_END_TEST \
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %T\n", program)); \
-  ace_file_stream.close (); \
-  ACE_DELAY_FOR_THREAD_TERMINATION
+  ace_file_stream.close ()
 
 #define ACE_APPEND_LOG(NAME) \
   const char *program = NAME; \