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.
This commit is contained in:
Joseph Myers 2017-04-28 16:52:16 +00:00
parent 0516e24d18
commit 085e07db22
3 changed files with 10 additions and 2 deletions

View File

@ -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> 2017-04-27 Joseph Myers <joseph@codesourcery.com>
* conform/GlibcConform.pm (XPG4): Rename standard to XPG42. * conform/GlibcConform.pm (XPG4): Rename standard to XPG42.

View File

@ -176,7 +176,6 @@ test-xfail-UNIX98/netinet/in.h/conform = yes
test-xfail-UNIX98/signal.h/conform = yes test-xfail-UNIX98/signal.h/conform = yes
test-xfail-UNIX98/sys/wait.h/conform = yes test-xfail-UNIX98/sys/wait.h/conform = yes
test-xfail-UNIX98/ucontext.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/signal.h/conform = yes
test-xfail-XOPEN2K/sys/wait.h/conform = yes test-xfail-XOPEN2K/sys/wait.h/conform = yes
test-xfail-XOPEN2K/ucontext.h/conform = yes test-xfail-XOPEN2K/ucontext.h/conform = yes

View File

@ -20,7 +20,9 @@ allow-header fcntl.h
# if !defined POSIX2008 && !defined XOPEN2K8 # if !defined POSIX2008 && !defined XOPEN2K8
allow-header sys/types.h allow-header sys/types.h
# endif # 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 allow-header time.h
# endif # endif