conformtest: Fix pselect expectations.

conformtest expected pselect for XOPEN2K and POSIX2008 (correctly),
but not for XOPEN2K8 (wrongly).  This patch fixes the data to expect
it for XOPEN2K8 as well.

(As for all such fixes based on failures seen from the tests, there is
no guarantee that the data is fully correct for a particular standard
after the fix; headers and data may well have matching bugs.  So far
I've only reviewed ISO, ISO99, ISO11 and POSIX data in detail, though
I hope eventually to review the others.)

Tested for x86_64 and x86.

	* conform/data/sys/select.h-data [XOPEN2K8] (pselect): Expect.
	* conform/Makefile (test-xfail-XOPEN2K8/sys/select.h/conform):
	Remove variable.
	(test-xfail-XOPEN2K8/sys/time.h/conform): Likewise.
	(test-xfail-XOPEN2K8/utmpx.h/conform).

diff --git a/ChangeLog b/ChangeLog
index 65adbd1afa67da9630efb241e0057d78b2703740..50a336fab3fee6c6864493402963629738b45a53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-06-19  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/sys/select.h-data [XOPEN2K8] (pselect): Expect.
+       * conform/Makefile (test-xfail-XOPEN2K8/sys/select.h/conform):
+       Remove variable.
+       (test-xfail-XOPEN2K8/sys/time.h/conform): Likewise.
+       (test-xfail-XOPEN2K8/utmpx.h/conform).
+
        * conform/conformtest.pl ($xerrors): New variable.
        (note_error): New function.
        (compiletest): New argument $xfail.  Use not_error.

diff --git a/conform/Makefile b/conform/Makefile
index 5db58375e788a9b6fc45460230d115cac10bfb62..7d0a3dd92ebf55f63e1aeb60cfdbf239ca92210f 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -237,12 +237,9 @@ test-xfail-XOPEN2K8/limits.h/conform = yes
 test-xfail-XOPEN2K8/math.h/conform = yes
 test-xfail-XOPEN2K8/signal.h/conform = yes
 test-xfail-XOPEN2K8/stdio.h/conform = yes
-test-xfail-XOPEN2K8/sys/select.h/conform = yes
-test-xfail-XOPEN2K8/sys/time.h/conform = yes
 test-xfail-XOPEN2K8/sys/wait.h/conform = yes
 test-xfail-XOPEN2K8/termios.h/conform = yes
 test-xfail-XOPEN2K8/tgmath.h/conform = yes
-test-xfail-XOPEN2K8/utmpx.h/conform = yes
 
 conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
 $(conformtest-header-tests): $(objpfx)%/conform.out: \

diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data
index 00f037ac5cbce686a91177a4286be0038cca9a23..d414ec4624d891e17af7014baf029d8209d9747e 100644 (file)
--- a/conform/data/sys/select.h-data
+++ b/conform/data/sys/select.h-data
@@ -24,7 +24,7 @@ macro FD_ZERO
 
 macro FD_SETSIZE
 
-#if defined XOPEN2K || defined POSIX2008
+#if defined XOPEN2K || defined POSIX2008 || defined XOPEN2K8
 function int pselect (int, fd_set*, fd_set*, fd_set*, const struct timespec*, const sigset_t*)
 #endif
 function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*)