summaryrefslogtreecommitdiff
path: root/conform/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'conform/Makefile')
-rw-r--r--conform/Makefile147
1 files changed, 49 insertions, 98 deletions
diff --git a/conform/Makefile b/conform/Makefile
index fddeaa1768..d43093171b 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1999-2016 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -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 \
@@ -34,26 +34,26 @@ conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \
conformtest-headers-ISO99 := $(conformtest-headers-ISO) complex.h fenv.h \
inttypes.h iso646.h stdbool.h stdint.h tgmath.h \
wchar.h wctype.h
-# Missing ISO11 expectations for: stdatomic.h threads.h.
+# Missing ISO11 expectations for: stdatomic.h
conformtest-headers-ISO11 := $(conformtest-headers-ISO99) stdalign.h \
- stdnoreturn.h uchar.h
+ stdnoreturn.h threads.h uchar.h
conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \
fcntl.h fnmatch.h glob.h grp.h mqueue.h \
pthread.h pwd.h regex.h sched.h semaphore.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 \
@@ -112,11 +112,9 @@ conformtest-header-base := $(foreach std,\
$(std)/$(h)/conform.out))
conformtest-header-tests := $(addprefix $(objpfx),$(conformtest-header-base))
ifneq (yes,$(fast-check))
-ifeq (no,$(cross-compiling))
tests-special += $(conformtest-header-tests)
generated += $(conformtest-header-base)
endif
-endif
linknamespace-symlists-base := $(foreach std,$(conformtest-standards),\
symlist-$(std))
@@ -152,116 +150,68 @@ $(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/fcntl.h/conform = yes
-test-xfail-XPG3/ftw.h/conform = yes
-test-xfail-XPG3/langinfo.h/conform = yes
-test-xfail-XPG3/limits.h/conform = yes
-test-xfail-XPG3/pwd.h/conform = yes
-test-xfail-XPG3/search.h/conform = yes
-test-xfail-XPG3/signal.h/conform = yes
-test-xfail-XPG3/stdio.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
-test-xfail-XPG3/unistd.h/conform = yes
-test-xfail-XPG4/arpa/inet.h/conform = yes
-test-xfail-XPG4/fcntl.h/conform = yes
-test-xfail-XPG4/langinfo.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/stdio.h/conform = yes
-test-xfail-XPG4/stdlib.h/conform = yes
-test-xfail-XPG4/sys/stat.h/conform = yes
-test-xfail-XPG4/sys/time.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
-test-xfail-XPG4/unistd.h/conform = yes
-test-xfail-XPG4/utmpx.h/conform = yes
-test-xfail-POSIX/sys/wait.h/conform = yes
-test-xfail-UNIX98/arpa/inet.h/conform = yes
-test-xfail-UNIX98/fcntl.h/conform = yes
-test-xfail-UNIX98/langinfo.h/conform = yes
-test-xfail-UNIX98/netdb.h/conform = yes
-test-xfail-UNIX98/netinet/in.h/conform = yes
-test-xfail-UNIX98/signal.h/conform = yes
-test-xfail-UNIX98/stdio.h/conform = yes
-test-xfail-UNIX98/stdlib.h/conform = yes
-test-xfail-UNIX98/sys/time.h/conform = yes
-test-xfail-UNIX98/sys/wait.h/conform = yes
-test-xfail-UNIX98/ucontext.h/conform = yes
-test-xfail-UNIX98/unistd.h/conform = yes
-test-xfail-UNIX98/utmpx.h/conform = yes
-test-xfail-XOPEN2K/aio.h/conform = yes
-test-xfail-XOPEN2K/fcntl.h/conform = yes
-test-xfail-XOPEN2K/langinfo.h/conform = yes
-test-xfail-XOPEN2K/mqueue.h/conform = yes
-test-xfail-XOPEN2K/semaphore.h/conform = yes
-test-xfail-XOPEN2K/signal.h/conform = yes
-test-xfail-XOPEN2K/stdarg.h/conform = yes
-test-xfail-XOPEN2K/stdio.h/conform = yes
-test-xfail-XOPEN2K/sys/wait.h/conform = yes
-test-xfail-XOPEN2K/termios.h/conform = yes
-test-xfail-XOPEN2K/ucontext.h/conform = yes
-test-xfail-POSIX2008/arpa/inet.h/conform = yes
-test-xfail-POSIX2008/netdb.h/conform = yes
-test-xfail-POSIX2008/netinet/in.h/conform = yes
-test-xfail-POSIX2008/signal.h/conform = yes
-test-xfail-POSIX2008/sys/socket.h/conform = yes
-test-xfail-POSIX2008/sys/wait.h/conform = yes
-test-xfail-XOPEN2K8/limits.h/conform = yes
-test-xfail-XOPEN2K8/signal.h/conform = yes
-test-xfail-XOPEN2K8/stdio.h/conform = yes
-test-xfail-XOPEN2K8/sys/wait.h/conform = yes
-test-xfail-XOPEN2K8/termios.h/conform = yes
-
conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
+# conformtest-xfail-conds may be set by a sysdeps Makefile fragment to
+# a list of conditions that are considered to be true when encountered
+# in xfail[cond]- lines in test expectations.
+conformtest-xfail = $(if $(conformtest-xfail-conds),\
+ --xfail='$(conformtest-xfail-conds)')
+ifeq (no,$(cross-compiling))
+conformtest-cross =
+else
+conformtest-cross = --cross
+endif
$(conformtest-header-tests): $(objpfx)%/conform.out: \
conformtest.pl $(conformtest-headers-data)
(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
mkdir -p $(@D)/scratch; \
- $(PERL) conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
+ $(PERL) -I. conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
--flags='$(conformtest-cc-flags)' --standard=$$std \
- --headers=$$hdr > $@); \
+ --headers=$$hdr $(conformtest-xfail) $(conformtest-cross) \
+ > $@); \
$(evaluate-test)
$(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl
- $(PERL) -w $< --tmpdir=$(objpfx) --cc='$(CC)' \
+ $(PERL) -I. -w $< --tmpdir=$(objpfx) --cc='$(CC)' \
--flags='$(conformtest-cc-flags)' --standard=$* \
--headers="$(strip $(conformtest-headers-$*))" \
> $@ 2> $@.err; \
$(evaluate-test)
linknamespace-libs-isoc = $(common-objpfx)libc.a $(common-objpfx)math/libm.a
-linknamespace-libs = $(linknamespace-libs-isoc) \
- $(common-objpfx)rt/librt.a $(static-thread-library)
+linknamespace-libs-thr = $(linknamespace-libs-isoc) \
+ $(common-objpfx)rt/librt.a $(static-thread-library)
+linknamespace-libs-posix = $(linknamespace-libs-thr) \
+ $(common-objpfx)dlfcn/libdl.a
+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-ISO11 = $(linknamespace-libs-isoc) \
+ $(static-thread-library)
linknamespace-libs-XPG4 = $(linknamespace-libs-isoc)
-linknamespace-libs-POSIX = $(linknamespace-libs)
-linknamespace-libs-UNIX98 = $(linknamespace-libs)
-linknamespace-libs-XOPEN2K = $(linknamespace-libs)
-linknamespace-libs-POSIX2008 = $(linknamespace-libs)
-linknamespace-libs-XOPEN2K8 = $(linknamespace-libs)
+linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4)
+linknamespace-libs-POSIX = $(linknamespace-libs-thr)
+linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi)
+linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi)
+linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix)
+linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi)
+linknamespace-libs = $(foreach std,$(conformtest-standards),\
+ $(linknamespace-libs-$(std)))
+
+ifeq ($(build-crypt),yes)
+linknamespace-libs-xsi += $(common-objpfx)crypt/libcrypt.a
+linknamespace-libs-XPG4 += $(common-objpfx)crypt/libcrypt.a
+endif
$(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
$(linknamespace-libs)
@@ -270,10 +220,11 @@ $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
$(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \
linknamespace.pl \
+ $(linknamespace-symlists-tests) \
$(linknamespace-symlist-stdlibs-tests)
(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
mkdir -p $(@D)/scratch; \
- $(PERL) -w $< --tmpdir=$(@D)/scratch --cc='$(CC)' \
+ $(PERL) -I. -w $< --tmpdir=$(@D)/scratch --cc='$(CC)' \
--flags='$(conformtest-cc-flags)' --standard=$$std \
--stdsyms=$(objpfx)symlist-$$std --header=$$hdr \
--libsyms=$(objpfx)symlist-stdlibs-$$std \
@@ -283,12 +234,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