Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13699:700156212a0d
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Fri, 17 Sep 2010 15:43:00 -0600 |
| parents | 29d663caae3e |
| children | 64110b464ca2 |
| files | ChangeLog tests/test-stdlib.c tests/test-sys_wait.c |
| diffstat | 3 files changed, 33 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/tests/test-stdlib.c +++ b/tests/test-stdlib.c @@ -45,9 +45,21 @@ 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)
--- a/tests/test-sys_wait.c +++ b/tests/test-sys_wait.c @@ -30,8 +30,20 @@ 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)