diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Pipe_Test.cpp | 11 | ||||
| -rw-r--r-- | tests/Process_Manager_Test.cpp | 13 | ||||
| -rw-r--r-- | tests/Process_Mutex_Test.cpp | 17 | ||||
| -rw-r--r-- | tests/Signal_Test.cpp | 6 | ||||
| -rw-r--r-- | tests/Time_Service_Test.cpp | 6 |
6 files changed, 10 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog index 4556f9c5ab9..e8259e2678d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 23 06:15:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_Thread.inl: + Fixed incorrect check in ACE_OS::condattr_init() + Thu Apr 22 22:22:59 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * bin/clone.cpp: diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index f1767c1af48..8f33909373d 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -25,7 +25,6 @@ ACE_RCSID(tests, Pipe_Test, "$Id$") -#if !defined (ACE_LACKS_FORK) static int close_pipe = 1; static int child_process = 0; static int iterations = ACE_MAX_ITERATIONS; @@ -77,19 +76,10 @@ open (ACE_Pipe &pipe, if (close_pipe) pipe.close (); } -#endif /* ! ACE_LACKS_FORK */ int run_main (int argc, ACE_TCHAR *argv[]) { -#if defined (ACE_LACKS_FORK) - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - - ACE_START_TEST (ACE_TEXT ("Pipe_Test")); - ACE_ERROR ((LM_INFO, ACE_TEXT ("fork is not supported on this platform\n"))); - ACE_END_TEST; -#else /* ! ACE_LACKS_FORK */ parse_args (argc, argv); if (child_process) @@ -153,7 +143,6 @@ run_main (int argc, ACE_TCHAR *argv[]) } ACE_END_TEST; } -#endif /* ! ACE_LACKS_FORK */ return 0; } diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp index f56ccea7557..34c3010640e 100644 --- a/tests/Process_Manager_Test.cpp +++ b/tests/Process_Manager_Test.cpp @@ -34,8 +34,6 @@ ACE_RCSID(tests, Process_Manager_Test, "Process_Manager_Test.cpp,v 4.11 1999/09/02 04:36:30 schmidt Exp") -#if (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32)) - static u_int debug_test = 0; class Exit_Handler : public ACE_Event_Handler @@ -303,14 +301,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return test_status; } -#else /* (!ACE_LACKS_FORK || ACE_WIN32) */ -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Process_Manager_Test")); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("The ACE Process Manager is not supported on this platform\n"))); - ACE_END_TEST; - return 0; -} -#endif /* (!ACE_LACKS_FORK || ACE_WIN32) */ diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index e8540059be3..40af86e54ef 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -27,7 +27,6 @@ ACE_RCSID(tests, Process_Mutex_Test, "$Id$") -#if !defined (ACE_LACKS_FORK) static int release_mutex = 1; static int child_process = 0; static const char *mutex_name = ACE_DEFAULT_MUTEX; @@ -123,21 +122,10 @@ acquire_release (void) ACE_ASSERT (mutex.release () == 0); } } -#endif /* ! ACE_LACKS_FORK */ int run_main (int argc, ACE_TCHAR *argv[]) { -#if defined (ACE_LACKS_FORK) - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - - ACE_START_TEST (ACE_TEXT ("Process_Mutex_Test")); - ACE_ERROR ((LM_INFO, - ACE_TEXT ("fork is not supported on this platform\n"))); - ACE_END_TEST; -#else /* ! ACE_LACKS_FORK */ - parse_args (argc, argv); // Child process code. @@ -153,8 +141,8 @@ run_main (int argc, ACE_TCHAR *argv[]) # if !defined( ACE_HAS_SYSV_IPC) || defined( ACE_USES_MUTEX_FOR_PROCESS_MUTEX ) // When Process_Mutex is pthreads based, then the owner of mutex destroys it // in destructor. This may disturb the other processes which still uses the - // mutex. It is safer then to hold the mutex in main process, and destroy it after - // children finish. This is temporary solution, and in future pthread base + // mutex. It is safer then to hold the mutex in main process, and destroy it after + // children finish. This is temporary solution, and in future pthread base // Process_Mutex shall control the destruction of mutex better. ACE_Process_Mutex mutex( ACE_TEXT_CHAR_TO_TCHAR( mutex_name ) ); # endif @@ -215,7 +203,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; } -#endif /* ! ACE_LACKS_FORK */ return 0; } diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp index a5b5cc3de62..e0b57d378d8 100644 --- a/tests/Signal_Test.cpp +++ b/tests/Signal_Test.cpp @@ -30,7 +30,7 @@ ACE_RCSID(tests, Signal_Test, "$Id$") -#if !defined (ACE_LACKS_FORK) && !defined (ACE_LACKS_UNIX_SIGNALS) +#if !defined (ACE_LACKS_UNIX_SIGNALS) // Global options. static size_t n_iterations = 100000; @@ -485,8 +485,8 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Signal_Test")); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("The ACE_Process capability is not supported on this platform\n"))); + ACE_TEXT ("The Unix Signals capability is not supported on this platform\n"))); ACE_END_TEST; return 0; } -#endif /* !ACE_LACKS_FORK && !defined (ACE_LACKS_UNIX_SIGNALS) */ +#endif /* !defined (ACE_LACKS_UNIX_SIGNALS) */ diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index 7b28dd4c249..3028295f80a 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -40,11 +40,6 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Time_Service_Test")); -#if defined (ACE_LACKS_FORK) && !defined (ACE_WIN32) - ACE_ERROR ((LM_INFO, - ACE_TEXT ("fork is not supported on this platform\n"))); -#else /* ! ACE_LACKS_FORK || ACE_WIN32 */ - // Make sure that the backing store is not there. We need to make // sure because this test kills the Time Clerk and on some platforms // the Clerk is not allowed to do a graceful shutdown. By cleaning @@ -119,7 +114,6 @@ run_main (int, ACE_TCHAR *[]) // graceful shutdown and the backing store file is left behind. if (clerk.wait () != 0) ACE_OS::unlink (backing_store); -#endif /* ! ACE_LACKS_FORK || ACE_WIN32 */ ACE_END_TEST; return 0; |