Work around environments that (stupidly) ignore SIGALRM.

4 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2675fe2bf2..97aec20e88 100644
--- 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 c074a4e52b..0061d54608 100644
--- 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 6eb145eb32..5e7fd36cda 100644
--- 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 81242e5b47..9f2ecde1ae 100644
--- 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