diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-19 20:52:44 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-19 20:52:44 +0000 |
| commit | d6cc0b4feaacf7514167cde0b3935f0c9b2c2d88 (patch) | |
| tree | 45a399dfd6ca90fe6515b2576f5f6fc91e5e53dd | |
| parent | 5675961d15cf3bb9bf7b0096704d5fe09569e875 (diff) | |
| download | glibc-d6cc0b4feaacf7514167cde0b3935f0c9b2c2d88.tar.gz glibc-d6cc0b4feaacf7514167cde0b3935f0c9b2c2d88.tar.xz glibc-d6cc0b4feaacf7514167cde0b3935f0c9b2c2d88.zip | |
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).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | conform/Makefile | 3 | ||||
| -rw-r--r-- | conform/data/sys/select.h-data | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 65adbd1afa..50a336fab3 100644 --- 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 5db58375e7..7d0a3dd92e 100644 --- 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 00f037ac5c..d414ec4624 100644 --- 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*) |