diff options
| author | Steve Huston <shuston@riverace.com> | 2005-08-25 16:34:06 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2005-08-25 16:34:06 +0000 |
| commit | 9e627a3546268e8c98501eca869dff7f6c0f3d15 (patch) | |
| tree | 0f0dabb8934133f0d551e703218c1442f62014b3 | |
| parent | 532573fb2ac84cfcfc5330f32bfe9b4bacd876cd (diff) | |
| download | ATCD-9e627a3546268e8c98501eca869dff7f6c0f3d15.tar.gz | |
ChangeLogTag:Thu Aug 25 12:32:18 2005 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Process_Manual_Event_Test.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index e8c00918581..264c23de04e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 25 12:32:18 2005 Steve Huston <shuston@riverace.com> + + * tests/Process_Manual_Event_Test.cpp: Removed #if0 block put in + for testing and fixed compile error. + Wed Aug 24 19:09:31 2005 Steve Huston <shuston@riverace.com> * configure.ac: Copied in updated copyright paragraph from COPYING. diff --git a/tests/Process_Manual_Event_Test.cpp b/tests/Process_Manual_Event_Test.cpp index 373e2e7fd76..1b1f90b71a8 100644 --- a/tests/Process_Manual_Event_Test.cpp +++ b/tests/Process_Manual_Event_Test.cpp @@ -28,7 +28,8 @@ #include "ace/OS_NS_sys_time.h" #include "ace/os_include/os_dirent.h" -#if !defined (ACE_LACKS_FORK) && \ + +#if (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32)) && \ (defined (ACE_WIN32) || \ (defined (ACE_HAS_PTHREADS) && defined (_POSIX_THREAD_PROCESS_SHARED) && \ !defined (ACE_LACKS_MUTEXATTR_PSHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)) || \ @@ -184,7 +185,6 @@ run_main (int argc, ACE_TCHAR *argv[]) else { ACE_START_TEST (ACE_TEXT ("Process_Manual_Event_Test")); -#if 0 ACE_Process_Options options; options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT ("Process_Manual_Event_Test") @@ -217,10 +217,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Child %d finished with status %d\n"), child.getpid (), child_status)); -#else - // start test - acquire_release (); -#endif ACE_END_TEST; } #else /* !ACE_LACKS_FORK */ |