Avoid test failure due to SA_RESTORER.

* tests/test-sigaction.c (SA_MASK): New macro.
(main): Avoid failing due to extension flags being set.
Reported by Jim Meyering.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index fe2dade74ca59f3ea52779e52a9087915879959d..414c0dfff4322eebbf82c0326e9f7f55e317b5ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-23  Eric Blake  <ebb9@byu.net>
 
+       Avoid test failure due to SA_RESTORER.
+       * tests/test-sigaction.c (SA_MASK): New macro.
+       (main): Avoid failing due to extension flags being set.
+       Reported by Jim Meyering.
+
        Revert use of sig-handler.h in sigprocmask.c.
        * modules/sigprocmask (Files): Don't rely on sig-handler.h, since
        it requires the existence of struct sigaction.

diff --git a/tests/test-sigaction.c b/tests/test-sigaction.c
index 81abe8919029c2eee779ebddb7419bd94ceca130..e009bf602290212de9240d2b2ef5fd2469a48a48 100644 (file)
--- a/tests/test-sigaction.c
+++ b/tests/test-sigaction.c
@@ -36,9 +36,24 @@
     }                                                                       \
   while (0)
 
+#ifndef SA_NOCLDSTOP
+# define SA_NOCLDSTOP 0
+#endif
+#ifndef SA_ONSTACK
+# define SA_ONSTACK 0
+#endif
 #ifndef SA_SIGINFO
 # define SA_SIGINFO 0
 #endif
+#ifndef SA_NOCLDWAIT
+# define SA_NOCLDWAIT 0
+#endif
+
+/* Define a mask of flags required by POSIX.  Some implementations
+   provide other flags as extensions, such as SA_RESTORER, that we
+   must ignore in this test.  */
+#define SA_MASK (SA_NOCLDSTOP | SA_ONSTACK | SA_RESETHAND | SA_RESTART \
+                SA_SIGINFO | SA_NOCLDWAIT | SA_NODEFER)
 
 /* This test is unsafe in the presence of an asynchronous SIGABRT,
    because we install a signal-handler that is intentionally not
@@ -80,7 +95,7 @@ main (int argc, char *argv[])
   ASSERT (raise (SIGABRT) == 0);
   sa.sa_flags = SA_RESETHAND | SA_NODEFER;
   ASSERT (sigaction (SIGABRT, &sa, &old_sa) == 0);
-  ASSERT (old_sa.sa_flags == 0);
+  ASSERT ((old_sa.sa_flags & SA_MASK) == 0);
   ASSERT (old_sa.sa_handler == handler);
   ASSERT (raise (SIGABRT) == 0);
   sa.sa_handler = SIG_DFL;