mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
2bf1804182
Tests run using the default $(make-test-out) automatically get GCONV_PATH and LC_ALL set, whether or not those environment variables are actually needed for the individual test. However, they do not get LOCPATH set, meaning that a large number of tests have -ENV settings just to set LOCPATH. This patch moves LOCPATH into the default environment used for all tests, on the principle that like GCONV_PATH any settings needed to use files associated with the newly built library, rather than any old installed files, are appropriate to use by default. A further motivation is that various tests using .sh files also set some combination of LC_ALL, GCONV_PATH and LOCPATH. Preferably .sh files should also use the default environment with any additions required for the individual test. Now, it was suggested in <https://sourceware.org/ml/libc-alpha/2014-05/msg00715.html> that various Makefile variables used in testing should be derived by composing the -before-env and -after-env variables used when explicit environment settings are required. With such a change, it's also natural for those variables to include the default settings (via some intermediate makefile variable also used in make-test-out). Because some .sh files only set variables that correspond to the default settings, or a subset thereof, and this applies to more of the .sh files once LOCPATH is in the default settings, doing so reduces the size of a revised version of <https://sourceware.org/ml/libc-alpha/2014-05/msg00596.html>: scripts only needing the (expanded) default settings will not need to receive the separate -before-env and -after-env variables, only the single variable they do at present. So moving LOCPATH into the default settings can reduce churn caused by subsequent patches. Tested x86_64 and x86. * Rules (make-test-out): Include LOCPATH=$(common-objpfx)localedata in default environment. * debug/Makefile (tst-chk1-ENV): Remove variable. (tst-chk2-ENV): Likewise. (tst-chk3-ENV): Likewise. (tst-chk4-ENV): Likewise. (tst-chk5-ENV): Likewise. (tst-chk6-ENV): Likewise. (tst-lfschk1-ENV): Likewise. (tst-lfschk2-ENV): Likewise. (tst-lfschk3-ENV): Likewise. (tst-lfschk4-ENV): Likewise. (tst-lfschk5-ENV): Likewise. (tst-lfschk6-ENV): Likewise. * iconvdata/Makefile (bug-iconv6-ENV): Likewise. (tst-iconv7-ENV): Likewise. * intl/Makefile (LOCPATH-ENV): Likewise. (tst-codeset-ENV): Likewise. (tst-gettext3-ENV): Likewise. (tst-gettext5-ENV): Likewise. * libio/Makefile (tst-widetext-ENV): Don't set LOCPATH. (tst-fopenloc-ENV): Likewise. (tst-fgetws-ENV): Remove variable. (tst-ungetwc1-ENV): Likewise. (tst-ungetwc2-ENV): Likewise. (bug-ungetwc2-ENV): Likewise. (tst-swscanf-ENV): Likewise. (bug-ftell-ENV): Likewise. (tst-fgetwc-ENV): Likewise. (tst-fseek-ENV): Likewise. (tst-ftell-partial-wide-ENV): Likewise. (tst-ftell-active-handler-ENV): Likewise. (tst-ftell-append-ENV): Likewise. * posix/Makefile (tst-fnmatch-ENV): Likewise. (tst-regexloc-ENV): Likewise. (bug-regex1-ENV): Likewise. (tst-regex-ENV): Likewise. (tst-regex2-ENV): Likewise. (bug-regex5-ENV): Likewise. (bug-regex6-ENV): Likewise. (bug-regex17-ENV): Likewise. (bug-regex18-ENV): Likewise. (bug-regex19-ENV): Likewise. (bug-regex20-ENV): Likewise. (bug-regex22-ENV): Likewise. (bug-regex23-ENV): Likewise. (bug-regex25-ENV): Likewise. (bug-regex26-ENV): Likewise. (bug-regex30-ENV): Likewise. (bug-regex32-ENV): Likewise. (bug-regex33-ENV): Likewise. (bug-regex34-ENV): Likewise. (bug-regex35-ENV): Likewise. (tst-rxspencer-ENV): Likewise. (tst-rxspencer-no-utf8-ENV): Likewise. * stdio-common/Makefile (tst-sprintf-ENV): Likewise. (tst-sscanf-ENV): Likewise. (tst-swprintf-ENV): Likewise. (tst-swscanf-ENV): Likewise. (test-vfprintf-ENV): Likewise. (scanf13-ENV): Likewise. (bug14-ENV): Likewise. (tst-grouping-ENV): Likewise. * stdlib/Makefile (tst-strtod-ENV): Likewise. (tst-strtod3-ENV): Likewise. (tst-strtod4-ENV): Likewise. (tst-strtod5-ENV): Likewise. (testmb2-ENV): Likewise./ * string/Makefile (tst-strxfrm-ENV): Likewise. (tst-strxfrm2-ENV): Likewise. (bug-strcoll1-ENV): Likewise. (test-strcasecmp-ENV): Likewise. (test-strncasecmp-ENV): Likewise. * time/Makefile (tst-strptime-ENV): Likewise. (tst-ftime_l-ENV): Likewise. * wcsmbs/Makefile (tst-btowc-ENV): Likewise. (tst-mbrtowc-ENV): Likewise. (tst-wcrtomb-ENV): Likewise. (tst-mbrtowc2-ENV): Likewise. (tst-c16c32-1-ENV): Likewise. (tst-mbsnrtowcs-ENV): Likewise. localedata/ChangeLog: * Makefile (TEST_MBWC_ENV): Remove variable. (tst_iswalnum-ENV): Likewise. (tst_iswalpha-ENV): Likewise. (tst_iswcntrl-ENV): Likewise. (tst_iswctype-ENV): Likewise. (tst_iswdigit-ENV): Likewise. (tst_iswgraph-ENV): Likewise. (tst_iswlower-ENV): Likewise. (tst_iswprint-ENV): Likewise. (tst_iswpunct-ENV): Likewise. (tst_iswspace-ENV): Likewise. (tst_iswupper-ENV): Likewise. (tst_iswxdigit-ENV): Likewise. (tst_mblen-ENV): Likewise. (tst_mbrlen-ENV): Likewise. (tst_mbrtowc-ENV): Likewise. (tst_mbsrtowcs-ENV): Likewise. (tst_mbstowcs-ENV): Likewise. (tst_mbtowc-ENV): Likewise. (tst_strcoll-ENV): Likewise. (tst_strfmon-ENV): Likewise. (tst_strxfrm-ENV): Likewise. (tst_swscanf-ENV): Likewise. (tst_towctrans-ENV): Likewise. (tst_towlower-ENV): Likewise. (tst_towupper-ENV): Likewise. (tst_wcrtomb-ENV): Likewise. (tst_wcscat-ENV): Likewise. (tst_wcschr-ENV): Likewise. (tst_wcscmp-ENV): Likewise. (tst_wcscoll-ENV): Likewise. (tst_wcscpy-ENV): Likewise. (tst_wcscspn-ENV): Likewise. (tst_wcslen-ENV): Likewise. (tst_wcsncat-ENV): Likewise. (tst_wcsncmp-ENV): Likewise. (tst_wcsncpy-ENV): Likewise. (tst_wcspbrk-ENV): Likewise. (tst_wcsrtombs-ENV): Likewise. (tst_wcsspn-ENV): Likewise. (tst_wcsstr-ENV): Likewise. (tst_wcstod-ENV): Likewise. (tst_wcstok-ENV): Likewise. (tst_wcstombs-ENV): Likewise. (tst_wcswidth-ENV): Likewise. (tst_wcsxfrm-ENV): Likewise. (tst_wctob-ENV): Likewise. (tst_wctomb-ENV): Likewise. (tst_wctrans-ENV): Likewise. (tst_wctype-ENV): Likewise. (tst_wcwidth-ENV): Likewise. (tst-digits-ENV): Likewise. (tst-mbswcs6-ENV): Likewise. (tst-xlocale1-ENV): Likewise. (tst-xlocale2-ENV): Likewise. (tst-strfmon1-ENV): Likewise. (tst-strptime-ENV): Likewise. (tst-setlocale-ENV): Don't set LOCPATH. (bug-iconv-trans-ENV): Remove variable. (tst-sscanf-ENV): Likewise. (tst-leaks-ENV): Don't set LOCPATH. (bug-setlocale1-ENV): Remove variable. (bug-setlocale1-static-ENV): Likewise. (tst-setlocale2-ENV): Likewise.
181 lines
7.2 KiB
Makefile
181 lines
7.2 KiB
Makefile
# Copyright (C) 1998-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/>.
|
|
|
|
#
|
|
# Sub-makefile for debug portion of the library.
|
|
#
|
|
subdir := debug
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := execinfo.h
|
|
|
|
# Note that ptsname_r_chk and getlogin_r are not here, but in
|
|
# login/Makefile instead. If that subdir is omitted from the
|
|
# build, its _FORTIFY_SOURCE support will be too.
|
|
routines = backtrace backtracesyms backtracesymsfd noophooks \
|
|
memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
|
|
strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \
|
|
sprintf_chk vsprintf_chk snprintf_chk vsnprintf_chk \
|
|
printf_chk fprintf_chk vprintf_chk vfprintf_chk \
|
|
gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \
|
|
read_chk pread_chk pread64_chk recv_chk recvfrom_chk \
|
|
readlink_chk readlinkat_chk getwd_chk getcwd_chk \
|
|
realpath_chk fread_chk fread_u_chk \
|
|
wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \
|
|
wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \
|
|
wcpncpy_chk \
|
|
swprintf_chk vswprintf_chk wprintf_chk fwprintf_chk \
|
|
vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
|
|
confstr_chk getgroups_chk ttyname_r_chk \
|
|
gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
|
|
wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
|
|
wcstombs_chk asprintf_chk vasprintf_chk dprintf_chk \
|
|
vdprintf_chk obprintf_chk \
|
|
longjmp_chk ____longjmp_chk \
|
|
fdelt_chk poll_chk ppoll_chk \
|
|
stack_chk_fail fortify_fail \
|
|
$(static-only-routines)
|
|
static-only-routines := warning-nop stack_chk_fail_local
|
|
|
|
CFLAGS-backtrace.c = -fno-omit-frame-pointer
|
|
CFLAGS-sprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-snprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-vsprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-vsnprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-asprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-vasprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-obprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-dprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-vdprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-printf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-vprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-vfprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-gets_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fgets_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fgets_u_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fread_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fread_u_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-swprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-vswprintf_chk.c = $(libio-mtsafe)
|
|
CFLAGS-wprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fwprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-vwprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-vfwprintf_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fgetws_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-fgetws_u_chk.c = $(libio-mtsafe) $(exceptions)
|
|
CFLAGS-read_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
|
|
# Need to make sure the settings here override what configure might have
|
|
# set up for us, so keep the CFLAGS/CPPFLAGS split logical as the order is:
|
|
# <user CFLAGS> <test CFLAGS> <user CPPFLAGS> <test CPPFLAGS>
|
|
CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk.c = -D_FORTIFY_SOURCE=1
|
|
CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk2.c = -D_FORTIFY_SOURCE=1
|
|
CFLAGS-tst-longjmp_chk3.c = -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk3.c = -D_FORTIFY_SOURCE=1
|
|
|
|
# We know these tests have problems with format strings, this is what
|
|
# we are testing. Disable that warning.
|
|
CFLAGS-tst-chk1.c = -Wno-format
|
|
CFLAGS-tst-chk2.c = -Wno-format
|
|
CFLAGS-tst-chk3.c = -Wno-format
|
|
CFLAGS-tst-chk4.cc = -Wno-format
|
|
CFLAGS-tst-chk5.cc = -Wno-format
|
|
CFLAGS-tst-chk6.cc = -Wno-format
|
|
CFLAGS-tst-lfschk1.c = -Wno-format
|
|
CFLAGS-tst-lfschk2.c = -Wno-format
|
|
CFLAGS-tst-lfschk3.c = -Wno-format
|
|
CFLAGS-tst-lfschk4.cc = -Wno-format
|
|
CFLAGS-tst-lfschk5.cc = -Wno-format
|
|
CFLAGS-tst-lfschk6.cc = -Wno-format
|
|
LDLIBS-tst-chk4 = -lstdc++
|
|
LDLIBS-tst-chk5 = -lstdc++
|
|
LDLIBS-tst-chk6 = -lstdc++
|
|
LDLIBS-tst-lfschk4 = -lstdc++
|
|
LDLIBS-tst-lfschk5 = -lstdc++
|
|
LDLIBS-tst-lfschk6 = -lstdc++
|
|
|
|
# backtrace_symbols only works if we link with -rdynamic. backtrace
|
|
# requires unwind tables on most architectures.
|
|
CFLAGS-tst-backtrace2.c += -funwind-tables
|
|
CFLAGS-tst-backtrace3.c += -funwind-tables
|
|
CFLAGS-tst-backtrace4.c += -funwind-tables
|
|
CFLAGS-tst-backtrace5.c += -funwind-tables
|
|
CFLAGS-tst-backtrace6.c += -funwind-tables
|
|
LDFLAGS-tst-backtrace2 = -rdynamic
|
|
LDFLAGS-tst-backtrace3 = -rdynamic
|
|
LDFLAGS-tst-backtrace4 = -rdynamic
|
|
LDFLAGS-tst-backtrace5 = -rdynamic
|
|
LDFLAGS-tst-backtrace6 = -rdynamic
|
|
|
|
tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \
|
|
tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \
|
|
tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6 \
|
|
tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 tst-backtrace4 \
|
|
tst-backtrace5 tst-backtrace6
|
|
|
|
tests-ifunc := $(stpcpy_chk strcpy_chk:%=test-%-ifunc)
|
|
tests += $(tests-ifunc)
|
|
|
|
extra-libs = libSegFault libpcprofile
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libSegFault-routines = segfault
|
|
libSegFault-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
libpcprofile-routines = pcprofile
|
|
libpcprofile-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
others = pcprofiledump
|
|
install-bin = pcprofiledump
|
|
install-bin-script = xtrace
|
|
|
|
ifeq ($(build-shared),yes)
|
|
install-bin-script += catchsegv
|
|
endif
|
|
generated += catchsegv xtrace
|
|
|
|
include ../Rules
|
|
|
|
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
|
|
|
|
$(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \
|
|
$(common-objpfx)config.make
|
|
slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \
|
|
sed -e 's|@VERSION@|$(version)|' -e "s|@SLIB@|$$slibpfx|" \
|
|
-e 's|@PKGVERSION@|$(PKGVERSION)|' \
|
|
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $< > $@.new
|
|
chmod 555 $@.new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
|
|
|
|
$(objpfx)xtrace: xtrace.sh
|
|
rm -f $@.new
|
|
sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
|
|
-e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
|
|
-e 's|@PKGVERSION@|$(PKGVERSION)|' \
|
|
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
|
|
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|