mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
7c3018f9e4
This patch adds a new build module called 'testsuite'.
IS_IN (testsuite) implies _ISOMAC, as do IS_IN_build and __cplusplus
(which means several ad-hoc tests for __cplusplus can go away).
libc-symbols.h now suppresses almost all of *itself* when _ISOMAC is
defined; in particular, _ISOMAC mode does not get config.h
automatically anymore.
There are still quite a few tests that need to see internal gunk of
one variety or another. For them, we now have 'tests-internal' and
'test-internal-extras'; files in this category will still be compiled
with MODULE_NAME=nonlib, and everything proceeds as it always has.
The bulk of this patch is moving tests from 'tests' to
'tests-internal'. There is also 'tests-static-internal', which has
the same effect on files in 'tests-static', and 'modules-names-tests',
which has the *inverse* effect on files in 'modules-names' (it's
inverted because most of the things in modules-names are *not* tests).
For both of these, the file must appear in *both* the new variable and
the old one.
There is also now a special case for when libc-symbols.h is included
without MODULE_NAME being defined at all. (This happens during the
creation of libc-modules.h, and also when preprocessing Versions
files.) When this happens, IS_IN is set to be always false and
_ISOMAC is *not* defined, which was the status quo, but now it's
explicit.
The remaining changes to C source files in this patch seemed likely to
cause problems in the absence of the main change. They should be
relatively self-explanatory. In a few cases I duplicated a definition
from an internal header rather than move the test to tests-internal;
this was a judgement call each time and I'm happy to change those
however reviewers feel is more appropriate.
* Makerules: New subdir configuration variables 'tests-internal'
and 'test-internal-extras'. Test files in these categories will
still be compiled with MODULE_NAME=nonlib. Test files in the
existing categories (tests, xtests, test-srcs, test-extras) are
now compiled with MODULE_NAME=testsuite.
New subdir configuration variable 'modules-names-tests'. Files
which are in both 'modules-names' and 'modules-names-tests' will
be compiled with MODULE_NAME=testsuite instead of
MODULE_NAME=extramodules.
(gen-as-const-headers): Move to tests-internal.
(do-tests-clean, common-mostlyclean): Support tests-internal.
* Makeconfig (built-modules): Add testsuite.
* Makefile: Change libof-check-installed-headers-c and
libof-check-installed-headers-cxx to 'testsuite'.
* Rules: Likewise. Support tests-internal.
* benchtests/strcoll-inputs/filelist#en_US.UTF-8:
Remove extra-modules.mk.
* config.h.in: Don't check for __OPTIMIZE__ or __FAST_MATH__ here.
* include/libc-symbols.h: Move definitions of _GNU_SOURCE,
PASTE_NAME, PASTE_NAME1, IN_MODULE, IS_IN, and IS_IN_LIB to the
very top of the file and rationalize their order.
If MODULE_NAME is not defined at all, define IS_IN to always be
false, and don't define _ISOMAC.
If any of IS_IN (testsuite), IS_IN_build, or __cplusplus are
true, define _ISOMAC and suppress everything else in this file,
starting with the inclusion of config.h.
Do check for inappropriate definitions of __OPTIMIZE__ and
__FAST_MATH__ here, but only if _ISOMAC is not defined.
Correct some out-of-date commentary.
* include/math.h: If _ISOMAC is defined, undefine NO_LONG_DOUBLE
and _Mlong_double_ before including math.h.
* include/string.h: If _ISOMAC is defined, don't expose
_STRING_ARCH_unaligned. Move a comment to a more appropriate
location.
* include/errno.h, include/stdio.h, include/stdlib.h, include/string.h
* include/time.h, include/unistd.h, include/wchar.h: No need to
check __cplusplus nor use __BEGIN_DECLS/__END_DECLS.
* misc/sys/cdefs.h (__NTHNL): New macro.
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h
(__m81_defun): Use __NTHNL to avoid errors with GCC 6.
* elf/tst-env-setuid-tunables.c: Include config.h with _LIBC
defined, for HAVE_TUNABLES.
* inet/tst-checks-posix.c: No need to define _ISOMAC.
* intl/tst-gettext2.c: Provide own definition of N_.
* math/test-signgam-finite-c99.c: No need to define _ISOMAC.
* math/test-signgam-main.c: No need to define _ISOMAC.
* stdlib/tst-strtod.c: Convert to test-driver. Split locale_test to...
* stdlib/tst-strtod1i.c: ...this new file.
* stdlib/tst-strtod5.c: Convert to test-driver and add copyright notice.
Split tests of __strtod_internal to...
* stdlib/tst-strtod5i.c: ...this new file.
* string/test-string.h: Include stdint.h. Duplicate definition of
inhibit_loop_to_libcall here (from libc-symbols.h).
* string/test-strstr.c: Provide dummy definition of
libc_hidden_builtin_def when including strstr.c.
* sysdeps/ia64/fpu/libm-symbols.h: Suppress entire file in _ISOMAC
mode; no need to test __STRICT_ANSI__ nor __cplusplus as well.
* sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
Don't include init-arch.h.
* sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
Don't include init-arch.h.
* elf/Makefile: Move tst-ptrguard1-static, tst-stackguard1-static,
tst-tls1-static, tst-tls2-static, tst-tls3-static, loadtest,
unload, unload2, circleload1, neededtest, neededtest2,
neededtest3, neededtest4, tst-tls1, tst-tls2, tst-tls3,
tst-tls6, tst-tls7, tst-tls8, tst-dlmopen2, tst-ptrguard1,
tst-stackguard1, tst-_dl_addr_inside_object, and all of the
ifunc tests to tests-internal.
Don't add $(modules-names) to test-extras.
* inet/Makefile: Move tst-inet6_scopeid_pton to tests-internal.
Add tst-deadline to tests-static-internal.
* malloc/Makefile: Move tst-mallocstate and tst-scratch_buffer to
tests-internal.
* misc/Makefile: Move tst-atomic and tst-atomic-long to tests-internal.
* nptl/Makefile: Move tst-typesizes, tst-rwlock19, tst-sem11,
tst-sem12, tst-sem13, tst-barrier5, tst-signal7, tst-tls3,
tst-tls3-malloc, tst-tls5, tst-stackguard1, tst-sem11-static,
tst-sem12-static, and tst-stackguard1-static to tests-internal.
Link tests-internal with libpthread also.
Don't add $(modules-names) to test-extras.
* nss/Makefile: Move tst-field to tests-internal.
* posix/Makefile: Move bug-regex5, bug-regex20, bug-regex33,
tst-rfc3484, tst-rfc3484-2, and tst-rfc3484-3 to tests-internal.
* stdlib/Makefile: Move tst-strtod1i, tst-strtod3, tst-strtod4,
tst-strtod5i, tst-tls-atexit, and tst-tls-atexit-nodelete to
tests-internal.
* sunrpc/Makefile: Move tst-svc_register to tests-internal.
* sysdeps/powerpc/Makefile: Move test-get_hwcap and
test-get_hwcap-static to tests-internal.
* sysdeps/unix/sysv/linux/Makefile: Move tst-setgetname to
tests-internal.
* sysdeps/x86_64/fpu/Makefile: Add all libmvec test modules to
modules-names-tests.
322 lines
11 KiB
Plaintext
322 lines
11 KiB
Plaintext
# Copyright (C) 1991-2017 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
|
||
# modify it under the terms of the GNU Lesser General Public
|
||
# License as published by the Free Software Foundation; either
|
||
# version 2.1 of the License, or (at your option) any later version.
|
||
|
||
# The GNU C Library is distributed in the hope that it will be useful,
|
||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
# Lesser General Public License for more details.
|
||
|
||
# You should have received a copy of the GNU Lesser General Public
|
||
# License along with the GNU C Library; if not, see
|
||
# <http://www.gnu.org/licenses/>.
|
||
|
||
#
|
||
# Rules for making a subdirectory in the GNU C library.
|
||
# Each subdirectory Makefile defines some variables and includes this.
|
||
#
|
||
ifneq (,)
|
||
This makefile requires GNU Make.
|
||
endif
|
||
|
||
all: # Don't let the default goal come from Makeconfig.
|
||
|
||
include $(firstword $(..) ../)Makeconfig
|
||
|
||
ifndef subdir
|
||
Each subdirectory makefile must define the `subdir' variable.
|
||
endif
|
||
# This ` unconfuses emacs.
|
||
# This is benign and useless in GNU make before 3.63.
|
||
export subdir := $(subdir)
|
||
|
||
# This is the default target; it makes the library and auxiliary programs.
|
||
.PHONY: all
|
||
all: objs lib others
|
||
|
||
ifeq ($(build-programs),yes)
|
||
others: $(addprefix $(objpfx),$(extra-objs) \
|
||
$(install-lib) \
|
||
$(install-bin) $(install-bin-script) \
|
||
$(install-rootsbin) $(install-sbin))
|
||
else
|
||
others: $(addprefix $(objpfx),$(extra-objs) \
|
||
$(install-lib))
|
||
endif
|
||
|
||
ifneq "$(findstring env,$(origin headers))" ""
|
||
headers :=
|
||
endif
|
||
|
||
ifneq "$(findstring env,$(origin generated))" ""
|
||
generated :=
|
||
endif
|
||
|
||
ifneq "$(findstring env,$(origin common-generated))" ""
|
||
common-generated :=
|
||
endif
|
||
|
||
# See below. This must be set before Makerules processes it.
|
||
before-compile += $(common-objpfx)bits/stdio_lim.h
|
||
|
||
include $(..)Makerules
|
||
|
||
.PHONY: subdir_lib
|
||
subdir_lib: lib-noranlib
|
||
|
||
# Some subdirs need to install a dummy library.
|
||
# They can use "$(objpfx)libfnord.a: $(dep-dummy-lib); $(make-dummy-lib)".
|
||
dep-dummy-lib = $(common-objpfx)dummy.o
|
||
define make-dummy-lib
|
||
$(AR) cr$(verbose) $@ $<
|
||
endef
|
||
|
||
$(common-objpfx)dummy.c:
|
||
rm -f $@
|
||
(echo 'extern void __dummy__ (void);'; \
|
||
echo 'void __dummy__ (void) { }') > $@
|
||
common-generated += dummy.o dummy.c
|
||
|
||
ifneq "$(headers)" ""
|
||
# Special test of all the installed headers in this directory.
|
||
tests-special += $(objpfx)check-installed-headers-c.out
|
||
libof-check-installed-headers-c := testsuite
|
||
$(objpfx)check-installed-headers-c.out: \
|
||
$(..)scripts/check-installed-headers.sh $(headers)
|
||
$(SHELL) $(..)scripts/check-installed-headers.sh c \
|
||
"$(CC) $(filter-out -std=%,$(CFLAGS)) -D_ISOMAC $(+includes)" \
|
||
$(headers) > $@; \
|
||
$(evaluate-test)
|
||
|
||
ifneq "$(CXX)" ""
|
||
tests-special += $(objpfx)check-installed-headers-cxx.out
|
||
libof-check-installed-headers-cxx := testsuite
|
||
$(objpfx)check-installed-headers-cxx.out: \
|
||
$(..)scripts/check-installed-headers.sh $(headers)
|
||
$(SHELL) $(..)scripts/check-installed-headers.sh c++ \
|
||
"$(CXX) $(filter-out -std=%,$(CXXFLAGS)) -D_ISOMAC $(+includes)" \
|
||
$(headers) > $@; \
|
||
$(evaluate-test)
|
||
endif
|
||
endif
|
||
|
||
# This makes all the auxiliary and test programs.
|
||
|
||
.PHONY: others tests bench bench-build
|
||
|
||
# Test programs for the pretty printers.
|
||
tests-printers-programs := $(addprefix $(objpfx),$(tests-printers))
|
||
|
||
# .out files with the output of running the pretty printer tests.
|
||
tests-printers-out := $(patsubst %,$(objpfx)%.out,$(tests-printers))
|
||
|
||
ifndef PYTHON
|
||
# Mark tests-printers tests as unsupported if we don't have PYTHON.
|
||
tests-unsupported += $(tests-printers)
|
||
endif
|
||
|
||
ifeq ($(build-programs),yes)
|
||
others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
|
||
else
|
||
others: $(addprefix $(objpfx),$(extra-objs))
|
||
endif
|
||
|
||
# Generate constant files for Python pretty printers if required.
|
||
others: $(py-const)
|
||
|
||
ifeq ($(run-built-tests),no)
|
||
tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported), \
|
||
$(tests) $(tests-internal)) \
|
||
$(test-srcs)) $(tests-special) \
|
||
$(tests-printers-programs)
|
||
xtests: tests $(xtests-special)
|
||
else
|
||
tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \
|
||
$(tests-special) $(tests-printers-out)
|
||
xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
|
||
endif
|
||
|
||
tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
|
||
xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
|
||
ifeq ($(run-built-tests),no)
|
||
tests-expected =
|
||
else
|
||
tests-expected = $(tests) $(tests-internal) $(tests-printers)
|
||
endif
|
||
tests:
|
||
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
||
$(sort $(tests-expected) $(tests-special-notdir:.out=)) \
|
||
> $(objpfx)subdir-tests.sum
|
||
xtests:
|
||
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
||
$(sort $(xtests) $(xtests-special-notdir:.out=)) \
|
||
> $(objpfx)subdir-xtests.sum
|
||
|
||
ifeq ($(build-programs),yes)
|
||
binaries-all-notests = $(others) $(sysdep-others)
|
||
binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs)
|
||
binaries-all = $(binaries-all-notests) $(binaries-all-tests)
|
||
binaries-static-notests = $(others-static)
|
||
binaries-static-tests = $(tests-static) $(xtests-static)
|
||
binaries-static = $(binaries-static-notests) $(binaries-static-tests)
|
||
ifeq (yesyes,$(have-fpie)$(build-shared))
|
||
binaries-pie-tests = $(tests-pie) $(xtests-pie)
|
||
binaries-pie-notests = $(others-pie)
|
||
else
|
||
binaries-pie-tests =
|
||
binaries-pie-notests =
|
||
endif
|
||
else
|
||
binaries-all-notests =
|
||
binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs)
|
||
binaries-all = $(binaries-all-tests)
|
||
binaries-static-notests =
|
||
binaries-static-tests =
|
||
binaries-static =
|
||
binaries-pie-tests =
|
||
binaries-pie-notests =
|
||
endif
|
||
|
||
binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
|
||
binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static), \
|
||
$(binaries-all-tests))
|
||
binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
|
||
$(binaries-all-notests))
|
||
|
||
ifneq "$(strip $(binaries-shared-notests))" ""
|
||
$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link)
|
||
endif
|
||
|
||
ifneq "$(strip $(binaries-shared-tests))" ""
|
||
$(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
|
||
$(link-extra-libs-tests) \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-tests)
|
||
endif
|
||
|
||
ifneq "$(strip $(binaries-pie-tests))" ""
|
||
$(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
|
||
$(link-extra-libs-tests) \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-pie-tests)
|
||
endif
|
||
|
||
ifneq "$(strip $(binaries-pie-notests))" ""
|
||
$(addprefix $(objpfx),$(binaries-pie-notests)): %: %.o \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-pie)
|
||
endif
|
||
|
||
ifneq "$(strip $(binaries-static-notests))" ""
|
||
$(addprefix $(objpfx),$(binaries-static-notests)): %: %.o \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc-static))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-static)
|
||
endif
|
||
|
||
ifneq "$(strip $(binaries-static-tests))" ""
|
||
$(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \
|
||
$(link-extra-libs-tests) \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc-static-tests))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-static-tests)
|
||
endif
|
||
|
||
ifneq "$(strip $(tests) $(tests-internal) $(xtests) $(test-srcs))" ""
|
||
# These are the implicit rules for making test outputs
|
||
# from the test programs and whatever input files are present.
|
||
|
||
define make-test-out
|
||
$(if $($*-ENV-only),$(test-wrapper-env-only) $($*-ENV-only),\
|
||
$(test-wrapper-env) $(run-program-env) $($*-ENV)) \
|
||
$(host-test-program-cmd) $($*-ARGS)
|
||
endef
|
||
$(objpfx)%.out: %.input $(objpfx)%
|
||
$(make-test-out) > $@ < $(word 1,$^); \
|
||
$(evaluate-test)
|
||
$(objpfx)%.out: /dev/null $(objpfx)% # Make it 2nd arg for canned sequence.
|
||
$(make-test-out) > $@; \
|
||
$(evaluate-test)
|
||
|
||
# tests-unsupported lists tests that we will not try to build at all in
|
||
# this configuration. Note this runs every time because it does not
|
||
# actually create its target. The dependency on Makefile is meant to
|
||
# ensure that it runs after a Makefile change to add a test to the list
|
||
# when it previously ran and produced a .out file (probably for a failure).
|
||
ifneq "$(strip $(tests-unsupported))" ""
|
||
$(tests-unsupported:%=$(objpfx)%.out): $(objpfx)%.out: Makefile
|
||
@rm -f $@
|
||
$(..)scripts/evaluate-test.sh $(patsubst $(common-objpfx)%.out,%,$@) \
|
||
77 false false > $(@:.out=.test-result)
|
||
endif
|
||
|
||
endif # tests
|
||
|
||
ifdef PYTHON
|
||
ifneq "$(strip $(tests-printers))" ""
|
||
|
||
# Static pattern rule for building the test programs for the pretty printers.
|
||
$(tests-printers-programs): %: %.o $(tests-printers-libs) \
|
||
$(sort $(filter $(common-objpfx)lib%,$(link-libc-static-tests))) \
|
||
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||
$(+link-printers-tests)
|
||
|
||
# Add the paths to the generated constants file and test_common_printers.py
|
||
# to PYTHONPATH so the test scripts can find them.
|
||
py-env := PYTHONPATH=$(py-const-dir):$(..)scripts:$${PYTHONPATH}
|
||
|
||
# Static pattern rule that matches the test-* targets to their .c and .py
|
||
# prerequisites. It'll run the corresponding test script for each test program
|
||
# we compiled and place its output in the corresponding .out file.
|
||
# The pretty printer files and test_common_printers.py must be present for all.
|
||
$(tests-printers-out): $(objpfx)%.out: $(objpfx)% %.py %.c $(pretty-printers) \
|
||
$(..)scripts/test_printers_common.py
|
||
$(test-wrapper-env) $(py-env) \
|
||
$(PYTHON) $*.py $*.c $(objpfx)$* $(pretty-printers) > $@; \
|
||
$(evaluate-test)
|
||
endif
|
||
endif
|
||
|
||
|
||
.PHONY: distclean realclean subdir_distclean subdir_realclean \
|
||
subdir_clean subdir_mostlyclean subdir_testclean
|
||
subdir_mostlyclean: mostlyclean
|
||
subdir_clean: clean
|
||
subdir_distclean: distclean
|
||
subdir_realclean: realclean
|
||
subdir_testclean: do-tests-clean
|
||
realclean: distclean
|
||
distclean: clean
|
||
|
||
# We want to install everything except the library itself, but update all
|
||
# our portions of the library because the parent make will install it later
|
||
# (likewise the stubs file).
|
||
.PHONY: subdir_install
|
||
subdir_install: install-no-libc.a lib-noranlib stubs
|
||
|
||
.PHONY: subdir_objs subdir_stubs
|
||
subdir_objs: objs
|
||
subdir_stubs: stubs
|
||
|
||
# Target required by the Hurd to ensure that all the MiG-generated
|
||
# headers are in place before building a subdirectory.
|
||
.PHONY: before-compile
|
||
before-compile: $(before-compile)
|
||
|
||
$(common-objpfx)dummy.o: $(common-objpfx)dummy.c $(before-compile);
|
||
$(compile-command.c)
|
||
|
||
# Local Variables:
|
||
# mode: makefile
|
||
# End:
|