ChangeLogTag: Wed Jul 21 15:21:32 1999 David L. Levine <levine@cs.wustl.edu>

2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index a9cf083084f..649593a25b9 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,10 @@
+Wed Jul 21 15:21:32 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * tests/Env_Value_Test.cpp (main): use the single-process
+          version if ACE_LACKS_FORK, in addition to if
+          ACE_HAS_NONSTATIC_OBJECT_MANAGER.  Thanks to
+          Riaz Syed <syed@Lynx.COM> for reporting this.
+
 Wed Jul 21 11:48:53 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * include/makeinclude/platform_vxworks5.x_g++.GNU:
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index e9d0a79b1c0..084102236dd 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -38,17 +38,15 @@ do { \
 } while (0)
 
 int
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) || defined (ACE_LACKS_FORK)
 // ACE_HAS_NONSTATIC_OBJECT_MANAGER only allows main to have two
-// arguments.  And on VxWorks, which uses
-// ACE_HAS_NONSTATIC_OBJECT_MANAGER, we can't use spawn because it
-// doesn't have <fork>.
+// arguments.  And on platforms that lack fork (), we can't use spawn.
 main (int argc, ASYS_TCHAR* [])
 {
   ACE_UNUSED_ARG (argc);
   ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_POSITIVE=10.2"));
   ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_NEGATIVE=-10.2"));
-#else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+#else  /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER  &&  ! ACE_LACKS_FORK */
 main (int argc, LPTSTR [], LPTSTR envp[])
 {
   if (argc == 1)
@@ -78,7 +76,7 @@ main (int argc, LPTSTR [], LPTSTR envp[])
       p.wait ();
     }
   else
-#endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+#endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER  &&  ! ACE_LACKS_FORK */
     {
       // In this case we're the child
       ACE_START_TEST (ASYS_TEXT ("Env_Value_Test"));