about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-04-27 14:03:14 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-04-27 14:03:14 +0000
commit9f57e65c93ed5ef2996566c593881a4197bd0096 (patch)
tree8ddda2651ef81fbe896956e93203c3e7aad4d8be
parentf749498fa53df9ead81e291cd9378d67483c2452 (diff)
downloadglibc-9f57e65c93ed5ef2996566c593881a4197bd0096.tar.gz
glibc-9f57e65c93ed5ef2996566c593881a4197bd0096.tar.xz
glibc-9f57e65c93ed5ef2996566c593881a4197bd0096.zip
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.
-rw-r--r--ChangeLog14
-rw-r--r--conform/Makefile2
-rw-r--r--conform/data/signal.h-data2
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 081994cf6f..a165b0a4bd 100644
--- 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 56a7dda2a2..26264fc96d 100644
--- 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 7584865f12..6fca921492 100644
--- 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