diff options
author | Joseph Myers <joseph@codesourcery.com> | 2017-04-27 20:29:35 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2017-04-27 20:29:35 +0000 |
commit | 0516e24d1882ee7f1946b53bec360b400548cb4f (patch) | |
tree | bd6e4dfaa5b27215a0aff026f45a286f65d654b7 /conform/Makefile | |
parent | 6ef8a2c76a79f803343d0d1242cacd1265246153 (diff) | |
download | glibc-0516e24d1882ee7f1946b53bec360b400548cb4f.zip glibc-0516e24d1882ee7f1946b53bec360b400548cb4f.tar.gz glibc-0516e24d1882ee7f1946b53bec360b400548cb4f.tar.bz2 |
conformtest: Fix XPG standard naming.
The conform/ tests test -D_XOPEN_SOURCE under the name "XPG3", and
-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED under the name "XPG4".
That naming is misleading. _XOPEN_SOURCE_EXTENDED actually means
XPG4.2, including UX-shaded interfaces. _XOPEN_SOURCE actually means
XPG4, or XPG4.2 without UX-shaded interfaces. (Prior XPG versions
also used _XOPEN_SOURCE, but without any versioning of the values of
the macro, so XPG4.2 without UX-shaded interfaces is the only sensible
set of interfaces for glibc to expose given _XOPEN_SOURCE=1 without
_XOPEN_SOURCE_EXTENDED defined.)
This patch fixes the naming in the conform/ tests, so that what is now
called XPG4 is changed to XPG42, and what is now called XPG3 is
changed to XPG4.
Tested for x86_64 (and verified the complete set of expectations is
unchanged by the patch beyond the intended renaming).
* conform/GlibcConform.pm (XPG4): Rename standard to XPG42.
(XPG3): Rename standard to XPG4.
* conform/Makefile: Likewise.
* conform/list-header-symbols.pl: Likewise.
* conform/data/aio.h-data: Likewise.
* conform/data/arpa/inet.h-data: Likewise.
* conform/data/complex.h-data: Likewise.
* conform/data/ctype.h-data: Likewise.
* conform/data/dlfcn.h-data: Likewise.
* conform/data/fcntl.h-data: Likewise.
* conform/data/fenv.h-data: Likewise.
* conform/data/float.h-data: Likewise.
* conform/data/fmtmsg.h-data: Likewise.
* conform/data/ftw.h-data: Likewise.
* conform/data/grp.h-data: Likewise.
* conform/data/inttypes.h-data: Likewise.
* conform/data/iso646.h-data: Likewise.
* conform/data/langinfo.h-data: Likewise.
* conform/data/libgen.h-data: Likewise.
* conform/data/limits.h-data: Likewise.
* conform/data/locale.h-data: Likewise.
* conform/data/math.h-data: Likewise.
* conform/data/mqueue.h-data: Likewise.
* conform/data/ndbm.h-data: Likewise.
* conform/data/net/if.h-data: Likewise.
* conform/data/netdb.h-data: Likewise.
* conform/data/netinet/in.h-data: Likewise.
* conform/data/poll.h-data: Likewise.
* conform/data/pthread.h-data: Likewise.
* conform/data/pwd.h-data: Likewise.
* conform/data/sched.h-data: Likewise.
* conform/data/search.h-data: Likewise.
* conform/data/semaphore.h-data: Likewise.
* conform/data/signal.h-data: Likewise.
* conform/data/spawn.h-data: Likewise.
* conform/data/stdbool.h-data: Likewise.
* conform/data/stdint.h-data: Likewise.
* conform/data/stdio.h-data: Likewise.
* conform/data/stdlib.h-data: Likewise.
* conform/data/string.h-data: Likewise.
* conform/data/strings.h-data: Likewise.
* conform/data/stropts.h-data: Likewise.
* conform/data/sys/mman.h-data: Likewise.
* conform/data/sys/resource.h-data: Likewise.
* conform/data/sys/select.h-data: Likewise.
* conform/data/sys/socket.h-data: Likewise.
* conform/data/sys/stat.h-data: Likewise.
* conform/data/sys/statvfs.h-data: Likewise.
* conform/data/sys/time.h-data: Likewise.
* conform/data/sys/timeb.h-data: Likewise.
* conform/data/sys/types.h-data: Likewise.
* conform/data/sys/uio.h-data: Likewise.
* conform/data/sys/un.h-data: Likewise.
* conform/data/sys/wait.h-data: Likewise.
* conform/data/syslog.h-data: Likewise.
* conform/data/termios.h-data: Likewise.
* conform/data/tgmath.h-data: Likewise.
* conform/data/time.h-data: Likewise.
* conform/data/ucontext.h-data: Likewise.
* conform/data/unistd.h-data: Likewise.
* conform/data/utmpx.h-data: Likewise.
* conform/data/varargs.h-data: Likewise.
* conform/data/wchar.h-data: Likewise.
* conform/data/wctype.h-data: Likewise.
Diffstat (limited to 'conform/Makefile')
-rw-r--r-- | conform/Makefile | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/conform/Makefile b/conform/Makefile index 19404fd..1f38b30 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -25,7 +25,7 @@ include ../Makeconfig conformtest-headers-data := $(wildcard data/*.h-data) \ $(wildcard data/*/*.h-data) -conformtest-standards := ISO ISO99 ISO11 POSIX XPG3 XPG4 UNIX98 XOPEN2K \ +conformtest-standards := ISO ISO99 ISO11 POSIX XPG4 XPG42 UNIX98 XOPEN2K \ POSIX2008 XOPEN2K8 conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \ @@ -43,17 +43,17 @@ conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \ sys/mman.h sys/stat.h sys/times.h sys/types.h \ sys/utsname.h sys/wait.h tar.h termios.h \ unistd.h utime.h wordexp.h -# Missing XPG3 expectations for: regexp.h wchar.h. -conformtest-headers-XPG3 := $(conformtest-headers-ISO) cpio.h dirent.h \ +# Missing XPG4 expectations for: regexp.h wchar.h. +conformtest-headers-XPG4 := $(conformtest-headers-ISO) cpio.h dirent.h \ fcntl.h fnmatch.h ftw.h glob.h grp.h iconv.h \ langinfo.h monetary.h nl_types.h pwd.h regex.h \ search.h sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \ sys/stat.h sys/times.h sys/types.h sys/utsname.h \ sys/wait.h tar.h termios.h ulimit.h unistd.h \ utime.h varargs.h wordexp.h -# Missing XPG4 expectations for: re_comp.h regexp.h wchar.h. -# XPG4 includes XTI, but xti.h is outside the scope of these tests. -conformtest-headers-XPG4 := $(conformtest-headers-XPG3) arpa/inet.h fmtmsg.h \ +# Missing XPG42 expectations for: re_comp.h regexp.h wchar.h. +# XPG42 includes XTI, but xti.h is outside the scope of these tests. +conformtest-headers-XPG42 := $(conformtest-headers-XPG4) arpa/inet.h fmtmsg.h \ libgen.h ndbm.h netdb.h netinet/in.h poll.h \ strings.h stropts.h sys/mman.h sys/resource.h \ sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h \ @@ -150,25 +150,25 @@ $(conformtest-header-list-tests): $(objpfx)header-list-%.out: \ # Pre-standard C feature no longer supported by GCC (obsoleted in # newer POSIX standards). -test-xfail-XPG3/varargs.h/conform = yes test-xfail-XPG4/varargs.h/conform = yes +test-xfail-XPG42/varargs.h/conform = yes test-xfail-UNIX98/varargs.h/conform = yes # Header not provided by glibc. -test-xfail-XPG4/ndbm.h/conform = yes +test-xfail-XPG42/ndbm.h/conform = yes test-xfail-UNIX98/ndbm.h/conform = yes test-xfail-XOPEN2K/ndbm.h/conform = yes test-xfail-XOPEN2K8/ndbm.h/conform = yes # Unsorted expected failures. -test-xfail-XPG3/signal.h/conform = yes -test-xfail-XPG3/sys/wait.h/conform = yes -test-xfail-XPG4/arpa/inet.h/conform = yes -test-xfail-XPG4/netdb.h/conform = yes -test-xfail-XPG4/netinet/in.h/conform = yes test-xfail-XPG4/signal.h/conform = yes test-xfail-XPG4/sys/wait.h/conform = yes -test-xfail-XPG4/ucontext.h/conform = yes +test-xfail-XPG42/arpa/inet.h/conform = yes +test-xfail-XPG42/netdb.h/conform = yes +test-xfail-XPG42/netinet/in.h/conform = yes +test-xfail-XPG42/signal.h/conform = yes +test-xfail-XPG42/sys/wait.h/conform = yes +test-xfail-XPG42/ucontext.h/conform = yes test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes test-xfail-UNIX98/netdb.h/conform = yes @@ -223,9 +223,9 @@ linknamespace-libs-xsi = $(linknamespace-libs-posix) \ linknamespace-libs-ISO = $(linknamespace-libs-isoc) linknamespace-libs-ISO99 = $(linknamespace-libs-isoc) linknamespace-libs-ISO11 = $(linknamespace-libs-isoc) -linknamespace-libs-XPG3 = $(linknamespace-libs-isoc) \ +linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) \ $(common-objpfx)crypt/libcrypt.a -linknamespace-libs-XPG4 = $(linknamespace-libs-XPG3) +linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4) linknamespace-libs-POSIX = $(linknamespace-libs-thr) linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi) linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi) @@ -255,12 +255,12 @@ $(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \ # Pre-standard C feature no longer supported by GCC (obsoleted in # newer POSIX standards). -test-xfail-XPG3/varargs.h/linknamespace = yes test-xfail-XPG4/varargs.h/linknamespace = yes +test-xfail-XPG42/varargs.h/linknamespace = yes test-xfail-UNIX98/varargs.h/linknamespace = yes # Header not provided by glibc. -test-xfail-XPG4/ndbm.h/linknamespace = yes +test-xfail-XPG42/ndbm.h/linknamespace = yes test-xfail-UNIX98/ndbm.h/linknamespace = yes test-xfail-XOPEN2K/ndbm.h/linknamespace = yes test-xfail-XOPEN2K8/ndbm.h/linknamespace = yes |