conformtest: Correct some signal.h expectations for XOPEN2K.

The conformtest expectations for signal.h have various declarations
that are expected for POSIX (1996) and all later standards, except,
wrongly, for XOPEN2K.  This shows up as failures of tests for two
other headers, which are allowed to make visible symbols from
signal.h, because of an incorrect namespace failure for sigval
(required in signal.h in XOPEN2K, so should be allowed for those other
headers); signal.h tests for various standards fail anyway because of
other problems in the header.  This patch fixes the incorrect
expectations and removes the two XFAILs that this fixes.

Tested for x86_64 and x86.

	* conform/data/signal.h-data (union sigval): Expect also if
	[XOPEN2K].
	(struct sigevent): Likewise.
	(SIGEV_NONE): Likewise.
	(SIGEV_SIGNAL): Likewise.
	(SIGEV_THREAD): Likewise.
	(SIGRTMIN): Likewise.
	(SIGRTMAX): Likewise.
	* conform/Makefile (test-xfail-XOPEN2K/aio.h/conform): Remove
	variable.
	(test-xfail-XOPEN2K/mqueue.h/conform): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 081994cf6f958da93d00def254c87fb40331770b..a165b0a4bd3f82e1dc22bafa0a1c22aed4394dae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-04-27  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/signal.h-data (union sigval): Expect also if
+       [XOPEN2K].
+       (struct sigevent): Likewise.
+       (SIGEV_NONE): Likewise.
+       (SIGEV_SIGNAL): Likewise.
+       (SIGEV_THREAD): Likewise.
+       (SIGRTMIN): Likewise.
+       (SIGRTMAX): Likewise.
+       * conform/Makefile (test-xfail-XOPEN2K/aio.h/conform): Remove
+       variable.
+       (test-xfail-XOPEN2K/mqueue.h/conform): Likewise.
+
 2016-04-27  Florian Weimer  <fweimer@redhat.com>
 
        [BZ #19830]

diff --git a/conform/Makefile b/conform/Makefile
index 56a7dda2a2a211e3319f8f263e6a1de0675819db..26264fc96d6d1f599b9ce31239a18e5e8a8a8d84 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -209,9 +209,7 @@ test-xfail-UNIX98/sys/wait.h/conform = yes
 test-xfail-UNIX98/ucontext.h/conform = yes
 test-xfail-UNIX98/unistd.h/conform = yes
 test-xfail-UNIX98/utmpx.h/conform = yes
-test-xfail-XOPEN2K/aio.h/conform = yes
 test-xfail-XOPEN2K/fcntl.h/conform = yes
-test-xfail-XOPEN2K/mqueue.h/conform = yes
 test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
 test-xfail-XOPEN2K/sys/wait.h/conform = yes

diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 7584865f120ffd27425506c78c3858465d22ce17..6fca9214924d62c997676e86de26fb97c57218fe 100644 (file)
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -33,7 +33,7 @@ element {struct timespec} __time_t tv_sec
 element {struct timespec} long tv_nsec
 #endif
 
-#if defined POSIX || defined UNIX98 || defined XOPEN2K8 || defined POSIX2008
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
 element {union sigval} int sival_int
 element {union sigval} {void*} sival_ptr