conformtest: Remove some bogus sys/types.h expectations for XPG3 and XPG4.

The conformtest tests for sys/types.h for XPG3 and XPG4 fail because
of missing blksize_t.  This is a bug in the expectations; that type is
not part of those standards.  This patch stops the tests from
expecting it, and some other types that also are not part of XPG3 and
XPG4.

Tested for x86_64 and x86.

	* conform/data/sys/types.h-data (blkcnt_t): Do not expect for
	[XPG3 || XPG4].
	(blksize_t): Likewise.
	(clockid_t): Likewise.
	* conform/Makefile (test-xfail-XPG3/sys/types.h/conform): Remove
	variable.
	(test-xfail-XPG4/sys/types.h/conform): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1f5261a315d8848a92503053b28f777c8c5cafab..88c2b5dc7d63e36c1764d5b145652fabf46e42e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-05-09  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/sys/types.h-data (blkcnt_t): Do not expect for
+       [XPG3 || XPG4].
+       (blksize_t): Likewise.
+       (clockid_t): Likewise.
+       * conform/Makefile (test-xfail-XPG3/sys/types.h/conform): Remove
+       variable.
+       (test-xfail-XPG4/sys/types.h/conform): Likewise.
+
 2016-05-09  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
        * sysdeps/unix/sysv/linux/s390/init-first.c:

diff --git a/conform/Makefile b/conform/Makefile
index d5273c174363b823d6d90ee89866fd13a168eac3..32714e74ba2e47819f88d5b7088ee67e124e1e59 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -172,7 +172,6 @@ test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/stdlib.h/conform = yes
 test-xfail-XPG3/string.h/conform = yes
 test-xfail-XPG3/sys/stat.h/conform = yes
-test-xfail-XPG3/sys/types.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG3/termios.h/conform = yes
 test-xfail-XPG3/time.h/conform = yes
@@ -184,7 +183,6 @@ test-xfail-XPG4/netinet/in.h/conform = yes
 test-xfail-XPG4/signal.h/conform = yes
 test-xfail-XPG4/stdlib.h/conform = yes
 test-xfail-XPG4/sys/stat.h/conform = yes
-test-xfail-XPG4/sys/types.h/conform = yes
 test-xfail-XPG4/sys/wait.h/conform = yes
 test-xfail-XPG4/termios.h/conform = yes
 test-xfail-XPG4/ucontext.h/conform = yes

diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data
index 36c5efac6318db528716c204e08ea92215be6aa6..496ebf4c18db167e64c0bb72e3463d20e6d3571c 100644 (file)
--- a/conform/data/sys/types.h-data
+++ b/conform/data/sys/types.h-data
@@ -1,9 +1,13 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11
 #if !defined POSIX
+# if !defined XPG3 && !defined XPG4
 type blkcnt_t
 type blksize_t
+# endif
 type clock_t
+# if !defined XPG3 && !defined XPG4
 type clockid_t
+# endif
 #endif
 type dev_t
 # if !defined POSIX