This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
conformtest: Correct sys/wait.h expectations for XPG4 [committed]
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Thu, 8 Jun 2017 22:35:40 +0000
- Subject: conformtest: Correct sys/wait.h expectations for XPG4 [committed]
- Authentication-results: sourceware.org; auth=none
This patch corrects the conformtest expectations for sys/wait.h for
XPG4. This does not change the test results for this header at the
makefile level since it fixes some spurious failures for this header
while introducing other failures previously hidden by incorrect
expectations. However, it shows up issues with stdlib.h for XPG4
defining W* names that are not permitted in this case (previously
wrongly allowed; the W* reservation is UX-shaded in XPG4.2 /
XSI-shaded in POSIX before 2008); that test is thus XFAILed.
Tested for x86_64. Committed.
2017-06-08 Joseph Myers <joseph@codesourcery.com>
* conform/data/sys/wait.h-data (WIFCONTINUED): Do not expect for
[XPG4].
(WEXITED): Likewise.
(WSTOPPED): Likewise.
(WCONTINUED): Likewise.
(WNOHANG): Likewise.
(WNOWAIT): Likewise.
(idtype_t): Likewise.
(P_ALL): Likewise.
(P_PID): Likewise.
(P_PGID): Likewise.
(id_t): Likewise.
(siginfo_t): Likewise.
(wait3): Likewise.
(waitid): Likewise.
(signal.h): Do not allow header for [XPG4].
(sys/resource.h): Likewise.
(si_*): Do not allow for [XPG4].
(W*): Likewise.
(P_*): Likewise.
(BUS_): Likewise.
(CLD_): Likewise.
(FPE_): Likewise.
(ILL_): Likewise.
(POLL_): Likewise.
(SEGV_): Likewise.
(SI_): Likewise.
(TRAP_): Likewise.
* conform/Makefile (test-xfail-XPG4/stdlib.h/conform): New
variable.
diff --git a/conform/Makefile b/conform/Makefile
index 63556b5..ac69153 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -162,6 +162,7 @@ test-xfail-XOPEN2K8/ndbm.h/conform = yes
# Unsorted expected failures.
test-xfail-XPG4/signal.h/conform = yes
+test-xfail-XPG4/stdlib.h/conform = yes
test-xfail-XPG4/sys/wait.h/conform = yes
test-xfail-XPG42/signal.h/conform = yes
test-xfail-XPG42/sys/wait.h/conform = yes
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 74a062e..912d95d 100644
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -7,7 +7,7 @@ constant WNOHANG
constant WUNTRACED
macro WEXITSTATUS
-# if !defined POSIX && !defined POSIX2008
+# if !defined XPG4 && !defined POSIX && !defined POSIX2008
macro WIFCONTINUED
# endif
macro WIFEXITED
@@ -16,7 +16,7 @@ macro WIFSTOPPED
macro WSTOPSIG
macro WTERMSIG
-# ifndef POSIX
+# if !defined XPG4 && !defined POSIX
constant WEXITED
constant WSTOPPED
# ifndef POSIX2008
@@ -26,7 +26,7 @@ constant WNOHANG
constant WNOWAIT
# endif
-#if !defined POSIX
+#if !defined XPG4 && !defined POSIX
type idtype_t
constant P_ALL
@@ -60,15 +60,15 @@ type pid_t
#endif
function pid_t wait (int*)
-#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#if !defined XPG4 && !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
function pid_t wait3 (int*, int, struct rusage*)
#endif
-#if !defined POSIX
+#if !defined XPG4 && !defined POSIX
function int waitid (idtype_t, id_t, siginfo_t*, int)
#endif
function pid_t waitpid (pid_t, int*, int)
-#if !defined POSIX
+#if !defined XPG4 && !defined POSIX
allow-header signal.h
allow-header sys/resource.h
--
Joseph S. Myers
joseph@codesourcery.com