mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
8540f6d2a7
One wart in the original support for test wrappers for cross testing, as noted in <https://sourceware.org/ml/libc-alpha/2012-10/msg00722.html>, is the requirement for test wrappers to pass a poorly-defined set of environment variables from the build system to the system running the glibc under test. Although some variables are passed explicitly via $(test-wrapper-env), including LD_* variables that simply can't be passed implicitly because of the side effects they'd have on the build system's dynamic linker, others are passed implicitly, including variables such as GCONV_PATH and LOCPATH that could potentially affect the build system's libc (so effectively relying on any such effects not breaking the wrappers). In addition, the code in cross-test-ssh.sh for preserving environment variables is fragile (it depends on how bash formats a list of exported variables, and could well break for multi-line variable definitions where the contents contain things looking like other variable definitions). This patch moves to explicitly passing environment variables via $(test-wrapper-env). Makefile variables that previously used $(test-wrapper) are split up into -before-env and -after-env parts that can be passed separately to the various .sh files used in testing, so those files can then insert environment settings between the two parts. The common default environment settings in make-test-out are made into a separate makefile variable that can also be passed to scripts, rather than many scripts duplicating those settings (for testing an installed glibc, it is desirable to have the GCONV_PATH setting on just one place, so just that one place needs to support it pointing to an installed sysroot instead of the build tree). The default settings are included in the variables such as $(test-program-prefix), so that if tests do not need any non-default settings they can continue to use single variables rather than the split-up variables. Although this patch cleans up LC_ALL=C settings (that being part of the common defaults), various LANG=C and LANGUAGE=C settings remain. Those are generally unnecessary and I propose a subsequent cleanup to remove them. LC_ALL takes precedence over LANG, and while LANGUAGE takes precedence over LC_ALL, it only does so for settings other than LC_ALL=C. So LC_ALL=C on its own is sufficient to ensure the C locale, and anything that gets LC_ALL=C does not need the other settings. While preparing this patch I noticed some tests with .sh files that appeared to do nothing beyond what the generic makefile support for tests can do (localedata/tst-wctype.sh - the makefiles support -ENV variables and .input files - and localedata/tst-mbswcs.sh - just runs five tests that could be run individually from the makefile). So I propose another subsequent cleanup to move those to using the generic support instead of special .sh files. Tested x86_64 (native) and powerpc32 (cross). * Makeconfig (run-program-env): New variable. (run-program-prefix-before-env): Likewise. (run-program-prefix-after-env): Likewise. (run-program-prefix): Define in terms of new variables. (built-program-cmd-before-env): New variable. (built-program-cmd-after-env): Likewise. (built-program-cmd): Define in terms of new variables. (test-program-prefix-before-env): New variable. (test-program-prefix-after-env): Likewise. (test-program-prefix): Define in terms of new variables. (test-program-cmd-before-env): New variable. (test-program-cmd-after-env): Likewise. (test-program-cmd): Define in terms of new variables. * Rules (make-test-out): Use $(run-program-env). * scripts/cross-test-ssh.sh (env_blacklist): Remove variable. (help): Do not mention environment variables. Mention --timeoutfactor option. (timeoutfactor): New variable. (blacklist_exports): Remove function. (exports): Remove variable. (command): Do not include ${exports}. * manual/install.texi (Configuring and compiling): Do not mention test wrappers preserving environment variables. Mention that last assignment to a variable must take precedence. * INSTALL: Regenerated. * benchtests/Makefile (run-bench): Use $(run-program-env). * catgets/Makefile ($(objpfx)test1.cat): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)test2.cat): Do not specify environment variables explicitly. ($(objpfx)de/libc.cat): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)test-gencat.out): Use $(test-program-cmd-before-env), $(run-program-env) and $(test-program-cmd-after-env). ($(objpfx)sample.SJIS.cat): Do not specify environment variables explicitly. * catgets/test-gencat.sh: Use test_program_cmd_before_env, run_program_env and test_program_cmd_after_env arguments. * elf/Makefile ($(objpfx)tst-pathopt.out): Use $(run-program-env). * elf/tst-pathopt.sh: Use run_program_env argument. * iconvdata/Makefile ($(objpfx)iconv-test.out): Use $(test-wrapper-env) and $(run-program-env). * iconvdata/run-iconv-test.sh: Use test_wrapper_env and run_program_env arguments. * iconvdata/tst-table.sh: Do not set GCONV_PATH explicitly. * intl/Makefile ($(objpfx)tst-gettext.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). ($(objpfx)tst-gettext2.out): Likewise. * intl/tst-gettext.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * intl/tst-gettext2.sh: Likewise. * intl/tst-gettext4.sh: Do not set environment variables explicitly. * intl/tst-gettext6.sh: Likewise. * intl/tst-translit.sh: Likewise. * malloc/Makefile ($(objpfx)tst-mtrace.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * malloc/tst-mtrace.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * math/Makefile (run-regen-ulps): Use $(run-program-env). * nptl/Makefile ($(objpfx)tst-tls6.out): Use $(run-program-env). * nptl/tst-tls6.sh: Use run_program_env argument. Set LANG=C explicitly with each use of ${test_wrapper_env}. * posix/Makefile ($(objpfx)wordexp-tst.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * posix/tst-getconf.sh: Do not set environment variables explicitly. * posix/wordexp-tst.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * stdio-common/tst-printf.sh: Do not set environment variables explicitly. * stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * stdlib/tst-fmtmsg.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. Split $test calls into $test_pre and $test. * timezone/Makefile (build-testdata): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). localedata/ChangeLog: * Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)sort-test.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). ($(objpfx)tst-fmon.out): Use $(run-program-prefix-before-env), $(run-program-env) and $(run-program-prefix-after-env). ($(objpfx)tst-locale.out): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)tst-trans.out): Use $(run-program-prefix-before-env), $(run-program-env), $(run-program-prefix-after-env), $(test-program-prefix-before-env) and $(test-program-prefix-after-env). ($(objpfx)tst-ctype.out): Use $(test-program-cmd-before-env), $(run-program-env) and $(test-program-cmd-after-env). ($(objpfx)tst-wctype.out): Likewise. ($(objpfx)tst-langinfo.out): Likewise. ($(objpfx)tst-langinfo-static.out): Likewise. * gen-locale.sh: Use localedef_before_env, run_program_env and localedef_after_env arguments. * sort-test.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * tst-ctype.sh: Use tst_ctype_before_env, run_program_env and tst_ctype_after_env arguments. * tst-fmon.sh: Use run_program_prefix_before_env, run_program_env and run_program_prefix_after_env arguments. * tst-langinfo.sh: Use tst_langinfo_before_env, run_program_env and tst_langinfo_after_env arguments. * tst-locale.sh: Use localedef_before_env, run_program_env and localedef_after_env arguments. * tst-mbswcs.sh: Do not set environment variables explicitly. * tst-numeric.sh: Likewise. * tst-rpmatch.sh: Likewise. * tst-trans.sh: Use run_program_prefix_before_env, run_program_env, run_program_prefix_after_env, test_program_prefix_before_env and test_program_prefix_after_env arguments. * tst-wctype.sh: Use tst_wctype_before_env, run_program_env and tst_wctype_after_env arguments.
233 lines
9.2 KiB
Makefile
233 lines
9.2 KiB
Makefile
# Copyright (C) 1996-2014 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/>.
|
|
|
|
# Makefile for the math library.
|
|
|
|
subdir := math
|
|
|
|
include ../Makeconfig
|
|
|
|
# Installed header files.
|
|
headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
|
|
bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \
|
|
fpu_control.h complex.h bits/cmathcalls.h fenv.h \
|
|
bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
|
|
bits/math-finite.h
|
|
|
|
# FPU support code.
|
|
aux := setfpucw fpu_control
|
|
|
|
# Build the -lm library.
|
|
|
|
extra-libs := libm
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libm-support = k_standard s_lib_version s_matherr s_signgam \
|
|
fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg \
|
|
ftestexcept fegetround fesetround fegetenv feholdexcpt \
|
|
fesetenv feupdateenv t_exp fedisblxcpt feenablxcpt \
|
|
fegetexcept
|
|
libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
|
|
e_hypot e_j0 e_j1 e_jn e_lgamma_r e_log e_log10 e_pow \
|
|
e_rem_pio2 e_remainder e_scalb e_sinh e_sqrt e_gamma_r \
|
|
e_ilogb \
|
|
k_cos k_rem_pio2 k_sin k_tan s_asinh s_atan s_cbrt \
|
|
s_ceil s_cos s_erf s_expm1 s_fabs \
|
|
s_floor s_log1p s_logb \
|
|
s_nextafter s_nexttoward s_rint s_scalbln \
|
|
s_significand s_sin s_tan s_tanh w_acos w_acosh w_asin \
|
|
w_atan2 w_atanh w_cosh w_drem w_exp w_exp2 w_exp10 w_fmod \
|
|
w_tgamma w_hypot w_j0 w_j1 w_jn w_lgamma w_lgamma_r \
|
|
w_log w_log10 w_pow w_remainder w_scalb w_sinh w_sqrt \
|
|
w_ilogb \
|
|
s_fpclassify s_fmax s_fmin s_fdim s_nan s_trunc \
|
|
s_remquo e_log2 e_exp2 s_round s_nearbyint s_sincos \
|
|
conj cimag creal cabs carg s_cexp s_csinh s_ccosh s_clog \
|
|
s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos \
|
|
s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
|
|
s_fma s_lrint s_llrint s_lround s_llround e_exp10 w_log2 \
|
|
s_isinf_ns s_issignaling $(calls:s_%=m_%) x2y2m1 k_casinh \
|
|
gamma_product
|
|
|
|
dbl-only-routines := branred doasin dosincos halfulp mpa mpatan2 \
|
|
mpatan mpexp mplog mpsqrt mptan sincos32 slowexp \
|
|
slowpow sincostab
|
|
libm-routines = $(strip $(libm-support) $(libm-calls) \
|
|
$(patsubst %_rf,%f_r,$(libm-calls:=f)) \
|
|
$(long-m-$(long-double-fcts))) \
|
|
$(dbl-only-routines)
|
|
long-m-routines = $(patsubst %_rl,%l_r,$(libm-calls:=l))
|
|
long-m-support = t_sincosl k_sincosl
|
|
long-m-yes = $(long-m-routines) $(long-m-support)
|
|
|
|
# These functions are in libc instead of libm because __printf_fp
|
|
# calls them, so any program using printf will need them linked in,
|
|
# and we don't want to have to link every program with -lm.
|
|
# In libm-calls (above), list m_foo in place of s_foo for any
|
|
# routine that should be compiled separately for its libc and libm versions.
|
|
calls = s_isinf s_isnan s_finite s_copysign s_modf s_scalbn s_frexp s_ldexp \
|
|
s_signbit
|
|
generated += $(foreach s,.c .S l.c l.S f.c f.S,$(calls:s_%=m_%$s))
|
|
routines = $(calls) $(calls:=f) $(long-c-$(long-double-fcts))
|
|
long-c-yes = $(calls:=l)
|
|
|
|
# Rules for the test suite.
|
|
tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
|
|
test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \
|
|
test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \
|
|
test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \
|
|
test-fenv-tls test-fenv-preserve $(tests-static)
|
|
tests-static = test-fpucw-static test-fpucw-ieee-static
|
|
# We do the `long double' tests only if this data type is available and
|
|
# distinct from `double'.
|
|
test-longdouble-yes = test-ldouble test-ildoubl
|
|
|
|
ifneq (no,$(PERL))
|
|
libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
|
|
test-ifloat test-idouble
|
|
libm-tests.o = $(addsuffix .o,$(libm-tests))
|
|
|
|
tests += $(libm-tests)
|
|
libm-tests-generated = libm-test-ulps.h libm-test.c
|
|
generated += $(libm-tests-generated) libm-test.stmp
|
|
|
|
# This is needed for dependencies
|
|
before-compile += $(objpfx)libm-test.c
|
|
|
|
ulps-file = $(firstword $(wildcard $(sysdirs:%=%/libm-test-ulps)))
|
|
|
|
$(addprefix $(objpfx), $(libm-tests-generated)): $(objpfx)libm-test.stmp
|
|
|
|
$(objpfx)libm-test.stmp: $(ulps-file) libm-test.inc gen-libm-test.pl \
|
|
auto-libm-test-out
|
|
$(make-target-directory)
|
|
$(PERL) gen-libm-test.pl -u $< -o "$(objpfx)"
|
|
@echo > $@
|
|
|
|
$(objpfx)test-float.o: $(objpfx)libm-test.stmp
|
|
$(objpfx)test-ifloat.o: $(objpfx)libm-test.stmp
|
|
$(objpfx)test-double.o: $(objpfx)libm-test.stmp
|
|
$(objpfx)test-idouble.o: $(objpfx)libm-test.stmp
|
|
$(objpfx)test-ldouble.o: $(objpfx)libm-test.stmp
|
|
$(objpfx)test-ildoubl.o: $(objpfx)libm-test.stmp
|
|
endif
|
|
|
|
CFLAGS-test-float.c = -fno-inline -ffloat-store -fno-builtin -frounding-math
|
|
CFLAGS-test-double.c = -fno-inline -ffloat-store -fno-builtin -frounding-math
|
|
CFLAGS-test-ldouble.c = -fno-inline -ffloat-store -fno-builtin -frounding-math
|
|
CFLAGS-test-tgmath.c = -fno-builtin
|
|
# The following testcase uses very long lines (>3 million), so it may take a
|
|
# while to compile it. See: http://llvm.org/bugs/show_bug.cgi?id=14106 and
|
|
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54402
|
|
CFLAGS-test-tgmath2.c = -fno-builtin
|
|
CFLAGS-test-tgmath-ret.c = -fno-builtin
|
|
CFLAGS-test-powl.c = -fno-builtin
|
|
CFLAGS-test-test-fenv.c = -frounding-math
|
|
CFLAGS-test-misc.c = -frounding-math
|
|
CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
|
|
-DTEST_FAST_MATH -fno-builtin -frounding-math
|
|
CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
|
|
-DTEST_FAST_MATH -fno-builtin -frounding-math
|
|
CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
|
|
-DTEST_FAST_MATH -fno-builtin -frounding-math
|
|
|
|
|
|
# The -lieee module sets the _LIB_VERSION_ switch to IEEE mode
|
|
# for error handling in the -lm functions.
|
|
install-lib += libieee.a
|
|
non-lib.a += libieee.a
|
|
extra-objs += libieee.a ieee-math.o
|
|
|
|
include ../Rules
|
|
|
|
ifneq (no,$(PERL))
|
|
# Run the math programs to automatically generate ULPs files.
|
|
.PHONY: regen-ulps
|
|
|
|
run-regen-ulps = $(test-wrapper-env) \
|
|
$(run-program-env) \
|
|
$($*-ENV) $(rtld-prefix) $${run}
|
|
|
|
regen-ulps: $(addprefix $(objpfx),$(libm-tests))
|
|
rm -f $(objpfx)ULPs; rm -f $(objpfx)NewUlps; \
|
|
cp $(ulps-file) $(objpfx)libm-test-ulps; \
|
|
for run in $^; do \
|
|
echo "Regenerating ULPs for $${run}"; \
|
|
$(run-regen-ulps) -u -o $(objpfx); \
|
|
cat $(objpfx)ULPs >> $(objpfx)libm-test-ulps; \
|
|
rm $(objpfx)ULPs; \
|
|
done; \
|
|
$(PERL) gen-libm-test.pl -o $(objpfx) -n -u $(objpfx)libm-test-ulps; \
|
|
echo "Automatic regeneration of ULPs complete."; \
|
|
echo "Difference between the current baseline and the new baseline is:";\
|
|
diff -urN $(ulps-file) $(objpfx)NewUlps; \
|
|
echo "Copy $(objpfx)NewUlps to $(ulps-file) (relative to source)."
|
|
else
|
|
regen-ulps:
|
|
@echo "Automatic regeneration of ULPs requires perl."; \
|
|
exit 1;
|
|
endif
|
|
|
|
# The generated sysd-rules file defines rules like this for sources
|
|
# coming from sysdeps/ directories. These rules find the generic sources.
|
|
define o-iterator-doit
|
|
$(objpfx)m_%$o: s_%.c $(before-compile); $$(compile-command.c)
|
|
endef
|
|
object-suffixes-left := $(all-object-suffixes)
|
|
include $(o-iterator)
|
|
|
|
|
|
# This file defines the default _LIB_VERSION variable that controls
|
|
# the error return conventions for the math functions.
|
|
CPPFLAGS-s_lib_version.c := -D_POSIX_MODE
|
|
|
|
# We don't want the fdlibm code to use the inline math functions,
|
|
# only the fdlibm code.
|
|
math-CPPFLAGS += -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES
|
|
|
|
ifneq ($(long-double-fcts),yes)
|
|
# The `double' and `long double' types are the same on this machine.
|
|
# We won't compile the `long double' code at all. Tell the `double' code
|
|
# to define aliases for the `FUNCl' names. To avoid type conflicts in
|
|
# defining those aliases, tell <math.h> to declare the `FUNCl' names with
|
|
# `double' instead of `long double'.
|
|
math-CPPFLAGS += -DNO_LONG_DOUBLE -D_Mlong_double_=double
|
|
endif
|
|
|
|
# The fdlibm code generates a lot of these warnings but is otherwise clean.
|
|
override CFLAGS += -Wno-uninitialized
|
|
|
|
# The -lieee library is actually an object file.
|
|
# The module just defines the _LIB_VERSION_ variable.
|
|
# It's not a library to make sure it is linked in instead of s_lib_version.o.
|
|
$(objpfx)libieee.a: $(objpfx)ieee-math.o
|
|
rm -f $@
|
|
$(patsubst %/,cd % &&,$(objpfx)) \
|
|
$(LN_S) $(<F) $(@F)
|
|
|
|
$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(libm)
|
|
$(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a
|
|
|
|
gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
|
|
add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
|
|
lshift rshift mp_clz_tab udiv_qrnnd inlines \
|
|
$(gmp-sysdep_routines))
|
|
$(objpfx)atest-exp: $(gmp-objs)
|
|
$(objpfx)atest-sincos: $(gmp-objs)
|
|
$(objpfx)atest-exp2: $(gmp-objs)
|
|
$(objpfx)test-fenv-tls: $(shared-thread-library)
|