diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-05-23 15:25:34 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-05-23 15:25:34 +0000 |
| commit | d912d3a1198dfa9acd59cb5a07e5ed27c910cb7f (patch) | |
| tree | e97e6b110a10941c5b787b595067c88d006afdac | |
| parent | f9b437d5efce93800b51ad2a437c8b1c9616bf80 (diff) | |
| download | glibc-d912d3a1198dfa9acd59cb5a07e5ed27c910cb7f.tar.gz glibc-d912d3a1198dfa9acd59cb5a07e5ed27c910cb7f.tar.xz glibc-d912d3a1198dfa9acd59cb5a07e5ed27c910cb7f.zip | |
conformtest: Correct some limits.h expectations for XPG3, XPG4.
The conform/ test of limits.h namespace for XPG3 was failing because of NL_* and NZERO defines. Those symbols are EX-shaded, not UX-shaded, so it's correct for them to be defined for XPG3; this patch corrects the expectations accordingly. (Actually it looks like they should not be listed as optional for these standards, but that's another matter.) Tested for x86_64 and x86. * conform/data/limits.h-data (CHARCLASS_NAME_MAX): Also expect for [XPG3 || XPG4]. (NL_ARGMAX): Also expect for [XPG3]. (NL_LANGMAX): Likewise. (NL_MSGMAX): Likewise. (NL_NMAX): Likewise. (NL_SETMAX): Likewise. (NL_TEXTMAX): Likewise. (NZERO): Likewise. (TMP_MAX): Likewise. * conform/Makefile (test-xfail-XPG3/limits.h/conform): Remove variable.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | conform/data/limits.h-data | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 45440d71ab..e2b3d4db0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2016-05-23 Joseph Myers <joseph@codesourcery.com> + * conform/data/limits.h-data (CHARCLASS_NAME_MAX): Also expect for + [XPG3 || XPG4]. + (NL_ARGMAX): Also expect for [XPG3]. + (NL_LANGMAX): Likewise. + (NL_MSGMAX): Likewise. + (NL_NMAX): Likewise. + (NL_SETMAX): Likewise. + (NL_TEXTMAX): Likewise. + (NZERO): Likewise. + (TMP_MAX): Likewise. + * conform/Makefile (test-xfail-XPG3/limits.h/conform): Remove + variable. + * sysdeps/unix/sysv/linux/bits/socket.h (PF_KCM): New macro. (PF_MAX): Update value. (AF_KCM): New macro. diff --git a/conform/Makefile b/conform/Makefile index b67e8e94b7..32a0937b06 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -163,7 +163,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes test-xfail-XOPEN2K8/ndbm.h/conform = yes # Unsorted expected failures. -test-xfail-XPG3/limits.h/conform = yes test-xfail-XPG3/signal.h/conform = yes test-xfail-XPG3/sys/wait.h/conform = yes test-xfail-XPG4/arpa/inet.h/conform = yes diff --git a/conform/data/limits.h-data b/conform/data/limits.h-data index 726db1e632..5ea68ff0b6 100644 --- a/conform/data/limits.h-data +++ b/conform/data/limits.h-data @@ -170,10 +170,10 @@ constant LONG_BIT >= 32 #endif constant SSIZE_MAX -#if !defined POSIX && !defined XPG3 && !defined XPG4 +#if !defined POSIX optional-constant CHARCLASS_NAME_MAX >= 14 #endif -#if !defined POSIX && !defined XPG3 +#if !defined POSIX optional-constant NL_ARGMAX >= 9 # if !defined POSIX2008 optional-constant NL_LANGMAX >= 14 @@ -188,7 +188,7 @@ optional-constant NL_TEXTMAX optional-constant NZERO >= 20 # endif #endif -#if defined XPG4 || defined UNIX98 +#if defined XPG3 || defined XPG4 || defined UNIX98 optional-constant TMP_MAX >= 10000 #endif |