mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20: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. |
||
---|---|---|
.. | ||
asprintf_chk.c | ||
backtrace-tst.c | ||
backtrace.c | ||
backtracesyms.c | ||
backtracesymsfd.c | ||
catchsegv.sh | ||
chk_fail.c | ||
confstr_chk.c | ||
Depend | ||
dprintf_chk.c | ||
execinfo.h | ||
fdelt_chk.c | ||
fgets_chk.c | ||
fgets_u_chk.c | ||
fgetws_chk.c | ||
fgetws_u_chk.c | ||
fortify_fail.c | ||
fprintf_chk.c | ||
fread_chk.c | ||
fread_u_chk.c | ||
fwprintf_chk.c | ||
getcwd_chk.c | ||
getdomainname_chk.c | ||
getgroups_chk.c | ||
gethostname_chk.c | ||
gets_chk.c | ||
getwd_chk.c | ||
longjmp_chk.c | ||
Makefile | ||
mbsnrtowcs_chk.c | ||
mbsrtowcs_chk.c | ||
mbstowcs_chk.c | ||
memcpy_chk.c | ||
memmove_chk.c | ||
mempcpy_chk.c | ||
memset_chk.c | ||
noophooks.c | ||
obprintf_chk.c | ||
pcprofile.c | ||
pcprofiledump.c | ||
poll_chk.c | ||
ppoll_chk.c | ||
pread64_chk.c | ||
pread_chk.c | ||
printf_chk.c | ||
read_chk.c | ||
readlink_chk.c | ||
readlinkat_chk.c | ||
readonly-area.c | ||
realpath_chk.c | ||
recv_chk.c | ||
recvfrom_chk.c | ||
segfault.c | ||
snprintf_chk.c | ||
sprintf_chk.c | ||
stack_chk_fail_local.c | ||
stack_chk_fail.c | ||
stpcpy_chk.c | ||
stpncpy_chk.c | ||
strcat_chk.c | ||
strcpy_chk.c | ||
strncat_chk.c | ||
strncpy_chk.c | ||
swprintf_chk.c | ||
test-stpcpy_chk-ifunc.c | ||
test-stpcpy_chk.c | ||
test-strcpy_chk-ifunc.c | ||
test-strcpy_chk.c | ||
tst-backtrace2.c | ||
tst-backtrace3.c | ||
tst-backtrace4.c | ||
tst-backtrace5.c | ||
tst-backtrace6.c | ||
tst-backtrace.h | ||
tst-chk1.c | ||
tst-chk2.c | ||
tst-chk3.c | ||
tst-chk4.cc | ||
tst-chk5.cc | ||
tst-chk6.cc | ||
tst-lfschk1.c | ||
tst-lfschk2.c | ||
tst-lfschk3.c | ||
tst-lfschk4.cc | ||
tst-lfschk5.cc | ||
tst-lfschk6.cc | ||
tst-longjmp_chk2.c | ||
tst-longjmp_chk3.c | ||
tst-longjmp_chk.c | ||
ttyname_r_chk.c | ||
vasprintf_chk.c | ||
vdprintf_chk.c | ||
Versions | ||
vfprintf_chk.c | ||
vfwprintf_chk.c | ||
vprintf_chk.c | ||
vsnprintf_chk.c | ||
vsprintf_chk.c | ||
vswprintf_chk.c | ||
vwprintf_chk.c | ||
warning-nop.c | ||
wcpcpy_chk.c | ||
wcpncpy_chk.c | ||
wcrtomb_chk.c | ||
wcscat_chk.c | ||
wcscpy_chk.c | ||
wcsncat_chk.c | ||
wcsncpy_chk.c | ||
wcsnrtombs_chk.c | ||
wcsrtombs_chk.c | ||
wcstombs_chk.c | ||
wctomb_chk.c | ||
wmemcpy_chk.c | ||
wmemmove_chk.c | ||
wmempcpy_chk.c | ||
wmemset_chk.c | ||
wprintf_chk.c | ||
xtrace.sh |