tests: fix unportable assumption on sys/wait.h

* tests/test-sys_wait.c (main): Relax test.
* tests/test-stdlib.c (main): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 0f8cbe10118e6941058847f10f85b6f6c6c09a2a..4a4f733f4c8a26114c9eada144bc37dea5f4492f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-17  Eric Blake  <eblake@redhat.com>
 
+       tests: fix unportable assumption on sys/wait.h
+       * tests/test-sys_wait.c (main): Relax test.
+       * tests/test-stdlib.c (main): Likewise.
+
        init.sh: accomodate directory with no .exes
        * tests/init.sh: Accomodate directory containing only scripts.
 

diff --git a/tests/test-stdlib.c b/tests/test-stdlib.c
index e613b27bba9de498b7eb452f8ff97be1633f4169..5a8f045f559287e96c0e7d607e814e71eea72872 100644 (file)
--- a/tests/test-stdlib.c
+++ b/tests/test-stdlib.c
@@ -45,9 +45,21 @@ main (void)
      Note that some of these macros are only portable when operating
      on an lvalue.  */
   int i;
-  for (i = 0; i < 0x10000; i = (i ? i << 1 : 1))
-    if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
-      return 1;
+  for (i = 0; i < 0x8000; i = (i ? i << 1 : 1))
+    {
+      /* POSIX requires that for all valid process statuses, that
+         exactly one of these three macros is true.  But not all
+         possible 16-bit values map to valid process status.
+         Traditionally, 8 of the bits are for WIFEXITED, 7 of the bits
+         to tell between WIFSIGNALED and WIFSTOPPED, and either 0x80
+         or 0x8000 to flag that core was also dumped.  Since we don't
+         know which byte is WIFEXITED, we skip the both possible bits
+         that can signal core dump.  */
+      if (i == 0x80)
+        continue;
+      if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
+        return 1;
+    }
   i = WEXITSTATUS (i) + WSTOPSIG (i) + WTERMSIG (i);
 
   switch (i)

diff --git a/tests/test-sys_wait.c b/tests/test-sys_wait.c
index 917de0dc692980da966592ca498412ee8c98a96d..e9e63b6bbda6b2d250ab170dfc8125aaeb275637 100644 (file)
--- a/tests/test-sys_wait.c
+++ b/tests/test-sys_wait.c
@@ -30,8 +30,20 @@ main (void)
      that these are safe only on lvalues.  */
   int i;
   for (i = 0; i < 0x10000; i = (i ? i << 1 : 1))
-    if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
-      return 1;
+    {
+      /* POSIX requires that for all valid process statuses, that
+         exactly one of these three macros is true.  But not all
+         possible 16-bit values map to valid process status.
+         Traditionally, 8 of the bits are for WIFEXITED, 7 of the bits
+         to tell between WIFSIGNALED and WIFSTOPPED, and either 0x80
+         or 0x8000 to flag that core was also dumped.  Since we don't
+         know which byte is WIFEXITED, we skip the both possible bits
+         that can signal core dump.  */
+      if (i == 0x80)
+        continue;
+      if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
+        return 1;
+    }
   i = WEXITSTATUS (i) + WSTOPSIG (i) + WTERMSIG (i);
 
   switch (i)