Work around environments that (stupidly) ignore SIGALRM.

diff --git a/ChangeLog b/ChangeLog
index 2675fe2bf23d6869b08a3beb159c7e9df38eff91..97aec20e88ff540237640c26601600a4966d23df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-10  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-memmem.c (main): Reset SIGALRM to default handling before
+       using alarm().
+       * tests/test-strcasestr.c (main): Likewise.
+       * tests/test-strstr.c (main): Likewise.
+
 2008-06-09  Bruno Haible  <bruno@clisp.org>
 
        Work around the Solaris 10 ACE ACLs ABI change.

diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index c074a4e52b32e5310baad9ca8c65da2e1e9072ea..0061d546083aef442ac31485bac26a3b9e205b9e 100644 (file)
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -43,6 +43,7 @@ main (int argc, char *argv[])
      caused by SIGALRM.  All known platforms that lack alarm also lack
      memmem, and the replacement memmem is known to not take too
      long.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (100);
 #endif
 

diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c
index 6eb145eb32cb87105d011179822dcaffdda083c0..5e7fd36cdadbe0126db7b92284a347c11708374d 100644 (file)
--- a/tests/test-strcasestr.c
+++ b/tests/test-strcasestr.c
@@ -44,6 +44,7 @@ main ()
      caused by SIGALRM.  All known platforms that lack alarm also lack
      memmem, and the replacement memmem is known to not take too
      long.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (50);
 #endif
 

diff --git a/tests/test-strstr.c b/tests/test-strstr.c
index 81242e5b47b123089bd810785975065d2d20befc..9f2ecde1aeb85cbe97f2a0828563a742e8367b7a 100644 (file)
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -43,6 +43,7 @@ main (int argc, char *argv[])
      caused by SIGALRM.  All known platforms that lack alarm also have
      a quadratic strstr, and the replacement strstr is known to not
      take too long.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (50);
 #endif