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

2 files changed, 26 insertions, 12 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 0fb43e9dcbf..978858a3ddc 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,18 +1,22 @@
 Wed Jul 21 15:54:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/DLL.cpp: ACE_HAS_MOSTLY_UNICODE_APIS fixes.
+        * ace/DLL.cpp: ACE_HAS_MOSTLY_UNICODE_APIS fixes.
 
-	* ace/OS.i (ctime):
-	* ace/OS.cpp (ctime): One copy should only be available when
-	  ACE_HAS_MOSTLY_UNICODE_APIS is defined.  Thanks to Steve for
-	  reporting this.
+        * ace/OS.i (ctime):
+        * ace/OS.cpp (ctime): One copy should only be available when
+          ACE_HAS_MOSTLY_UNICODE_APIS is defined.  Thanks to Steve for
+          reporting this.
 
 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.
+          ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+
+        * tests/Time_Service_Test.cpp (main): neuter if ACE_LACKS_FORK,
+          because the test uses ACE_Process::spawn ().
+
+          Thanks to Riaz Syed <syed@Lynx.COM> for reporting these.
 
 Wed Jul 21 11:48:53 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index acea9415223..8d4f8c1408e 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -43,6 +43,11 @@ main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Time_Service_Test"));
 
+#if defined (ACE_LACKS_FORK)
+  ACE_ERROR ((LM_INFO,
+              ASYS_TEXT ("fork is not supported on this platform\n")));
+#else  /* ! ACE_LACKS_FORK */
+
   // 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
@@ -59,7 +64,8 @@ main (int, ASYS_TCHAR *[])
     ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s).\n"),
                        ASYS_TEXT ("Server fork failed"), server_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"), server.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"),
+                server.getpid ()));
 
   ACE_OS::sleep (3);
 
@@ -72,21 +78,25 @@ main (int, ASYS_TCHAR *[])
     ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p: (%s).\n"),
                        ASYS_TEXT ("Clerk fork failed"), clerk_cl), -1);
   else
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"), clerk.getpid ()));
+    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"),
+                clerk.getpid ()));
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Sleeping...\n")));
   ACE_OS::sleep (10);
 
   if (clerk.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")),
+                      -1);
 
   if (server.terminate () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")),
+                      -1);
 
-  // Since we kill the clerk process, on Win32 it may not do a
+  // Because we kill the clerk process, on Win32 it may not do a
   // graceful shutdown and the backing store file is left behind.
   if (clerk.wait () != 0)
     ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE);
+#endif /* ! ACE_LACKS_FORK */
 
   ACE_END_TEST;
   return 0;