* m4/mktime.m4 (bigtime_test, main): Move alarm from

bigtime_test to main, since Solaris 7 (64-bit) mktime loops
even outside of bigtime_test.  Use a time limit of 60 seconds
for the whole test, not 10 seconds per iteration.

diff --git a/ChangeLog b/ChangeLog
index 34e0296f061f74eba551a401a666262410b9e658..418ba96ebcfcc57ecc5181415818dcb28c9dd2da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-04-17  Paul Eggert  <eggert@twinsun.com>
+
+       * m4/mktime.m4 (bigtime_test, main): Move alarm from
+       bigtime_test to main, since Solaris 7 (64-bit) mktime loops
+       even outside of bigtime_test.  Use a time limit of 60 seconds
+       for the whole test, not 10 seconds per iteration.
+
 1999-04-17  Erez Zadok  <ezk@cs.columbia.edu>
 
        * automake.in: Create stamps for headers in appropriate

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 7c6d305d5e16ac72282e5123566f8387fcccd1b2..0e33f4fe3c38e4b89c2a8b677b37bed7e54bb2d0 100644 (file)
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -104,11 +104,7 @@ bigtime_test (j)
   struct tm tm;
   time_t now;
   tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j;
-  /* This test makes some buggy mktime implementations loop.
-     Give up after 10 seconds.  */
-  alarm (10);
   now = mktime (&tm);
-  alarm (0);
   if (now != (time_t) -1)
     {
       struct tm *lt = localtime (&now);
@@ -133,6 +129,11 @@ main ()
   time_t t, delta;
   int i, j;
 
+  /* This test makes some buggy mktime implementations loop.
+     Give up after 60 seconds; a mktime slower than that
+     isn't worth using anyway.  */
+  alarm (60);
+
   for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
     continue;
   time_t_max--;