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.
106 lines
3.6 KiB
Makefile
106 lines
3.6 KiB
Makefile
# 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/>.
|
|
|
|
#
|
|
# Sub-makefile for inet portion of the library.
|
|
#
|
|
subdir := inet
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := netinet/ether.h netinet/in.h netinet/in_systm.h \
|
|
netinet/if_ether.h netinet/igmp.h \
|
|
netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
|
|
aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h
|
|
|
|
routines := htonl htons \
|
|
inet_lnaof inet_mkadr \
|
|
inet_netof inet_ntoa inet_net herrno herrno-loc \
|
|
gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \
|
|
gethstbynm_r gethstent gethstent_r \
|
|
getnetbyad getnetbyad_r getnetbynm getnetent getnetent_r \
|
|
getnetbynm_r \
|
|
getproto getproto_r getprtent getprtent_r getprtname getprtname_r \
|
|
getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \
|
|
getservent_r \
|
|
ether_aton ether_aton_r ether_hton ether_line \
|
|
ether_ntoa ether_ntoa_r ether_ntoh \
|
|
rcmd rexec ruserpass \
|
|
getnetgrent_r getnetgrent \
|
|
getaliasent_r getaliasent getaliasname getaliasname_r \
|
|
in6_addr getnameinfo if_index ifaddrs inet6_option \
|
|
getipv4sourcefilter setipv4sourcefilter \
|
|
getsourcefilter setsourcefilter inet6_opt inet6_rth \
|
|
inet6_scopeid_pton deadline
|
|
|
|
aux := check_pf check_native ifreq
|
|
|
|
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
|
|
tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \
|
|
tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \
|
|
tst-sockaddr test-hnto-types
|
|
|
|
# tst-deadline must be linked statically so that we can access
|
|
# internal functions.
|
|
tests-static += tst-deadline
|
|
tests-static-internal := tst-deadline
|
|
|
|
# tst-inet6_scopeid_pton also needs internal functions but does not
|
|
# need to be linked statically.
|
|
tests-internal := tst-inet6_scopeid_pton
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(have-thread-library),yes)
|
|
|
|
CFLAGS-gethstbyad_r.c = -fexceptions
|
|
CFLAGS-gethstbyad.c = -fexceptions
|
|
CFLAGS-gethstbynm_r.c = -fexceptions
|
|
CFLAGS-gethstbynm.c = -fexceptions
|
|
CFLAGS-gethstbynm2_r.c = -fexceptions
|
|
CFLAGS-gethstbynm2.c = -fexceptions
|
|
CFLAGS-gethstent_r.c = -fexceptions
|
|
CFLAGS-gethstent.c = -fexceptions
|
|
CFLAGS-rcmd.c = -fexceptions
|
|
CFLAGS-getnetbynm_r.c = -fexceptions
|
|
CFLAGS-getnetbynm.c = -fexceptions
|
|
CFLAGS-getnetbyad_r.c = -fexceptions
|
|
CFLAGS-getnetbyad.c = -fexceptions
|
|
CFLAGS-getnetent_r.c = -fexceptions
|
|
CFLAGS-getnetent.c = -fexceptions
|
|
CFLAGS-getaliasent_r.c = -fexceptions
|
|
CFLAGS-getaliasent.c = -fexceptions
|
|
CFLAGS-getrpcent_r.c = -fexceptions
|
|
CFLAGS-getrpcent.c = -fexceptions
|
|
CFLAGS-getservent_r.c = -fexceptions
|
|
CFLAGS-getservent.c = -fexceptions
|
|
CFLAGS-getprtent_r.c = -fexceptions
|
|
CFLAGS-getprtent.c = -fexceptions
|
|
CFLAGS-either_ntoh.c = -fexceptions
|
|
CFLAGS-either_hton.c = -fexceptions
|
|
CFLAGS-getnetgrent.c = -fexceptions
|
|
CFLAGS-getnetgrent_r.c = -fexceptions
|
|
|
|
CFLAGS-tst-checks-posix.c = -std=c99
|
|
CFLAGS-tst-sockaddr.c = -fno-strict-aliasing
|
|
|
|
endif
|
|
|
|
ifeq ($(build-static-nss),yes)
|
|
CFLAGS += -DSTATIC_NSS
|
|
endif
|