diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-05-09 21:10:10 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-05-09 21:10:10 +0000 |
| commit | 9e6e128d145157844cf446962a640eacafc54a01 (patch) | |
| tree | c3b251812aceaa6b9159a79c0ae96d578132ce49 | |
| parent | b91a333ecb223a4bb104ff5a64c9ee5a194789a3 (diff) | |
| download | glibc-9e6e128d145157844cf446962a640eacafc54a01.tar.gz glibc-9e6e128d145157844cf446962a640eacafc54a01.tar.xz glibc-9e6e128d145157844cf446962a640eacafc54a01.zip | |
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | conform/Makefile | 2 | ||||
| -rw-r--r-- | conform/data/sys/types.h-data | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1f5261a315..88c2b5dc7d 100644 --- 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 d5273c1743..32714e74ba 100644 --- 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 36c5efac63..496ebf4c18 100644 --- 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 |