conformtest: Allow time.h inclusion from semaphore.h for XOPEN2K.

POSIX.1:2001 added sem_timedwait, but said nothing about defining
struct timespec in semaphore.h.  The 2008 edition added a
corresponding permission to include <time.h> from <semaphore.h>.
Since this is the normal POSIX approach in such cases, it seems
appropriate to consider this a bug fix, and so this patch makes the
conform/ tests allow that inclusion for POSIX.1:2001 as well.

Tested for x86_64.

	* conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
	inclusion.
	* conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
	Remove.

diff --git a/ChangeLog b/ChangeLog
index 9ba5a94ba109ac6800714760c48b06c095c0c0a2..5bb80d7e68f40b6442ac569cc50a28feb826d29f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
+       inclusion.
+       * conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
+       Remove.
+
 2017-04-27  Joseph Myers  <joseph@codesourcery.com>
 
        * conform/GlibcConform.pm (XPG4): Rename standard to XPG42.

diff --git a/conform/Makefile b/conform/Makefile
index 1f38b306ae3dba214ba6603f291fe5f408419072..2039ae8df70811f628182f81357e2a06ce036c97 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -176,7 +176,6 @@ test-xfail-UNIX98/netinet/in.h/conform = yes
 test-xfail-UNIX98/signal.h/conform = yes
 test-xfail-UNIX98/sys/wait.h/conform = yes
 test-xfail-UNIX98/ucontext.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
 test-xfail-XOPEN2K/ucontext.h/conform = yes

diff --git a/conform/data/semaphore.h-data b/conform/data/semaphore.h-data
index 7c26cd3fd600017de8bc47196b3809d34acc70da..066c2f721b4df12f2b35afc1baa2cac0ea66a107 100644 (file)
--- a/conform/data/semaphore.h-data
+++ b/conform/data/semaphore.h-data
@@ -20,7 +20,9 @@ allow-header fcntl.h
 # if !defined POSIX2008 && !defined XOPEN2K8
 allow-header sys/types.h
 # endif
-# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K
+// Consider addition of this permission in POSIX.1:2008 as a bug fix,
+// so allow for POSIX.1:2001 as well since that includes sem_timedwait.
+# if !defined POSIX && !defined UNIX98
 allow-header time.h
 # endif