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. |
||
|---|---|---|
| .. | ||
| bits | ||
| sys | ||
| a64l.c | ||
| abort.c | ||
| abs.c | ||
| add_n.c | ||
| addmul_1.c | ||
| alloca.h | ||
| at_quick_exit.c | ||
| atexit.c | ||
| atof.c | ||
| atoi.c | ||
| atol.c | ||
| atoll.c | ||
| bsearch.c | ||
| bug-fmtmsg1.c | ||
| bug-getcontext.c | ||
| bug-strtod2.c | ||
| bug-strtod.c | ||
| canonicalize.c | ||
| cmp.c | ||
| cxa_at_quick_exit.c | ||
| cxa_atexit.c | ||
| cxa_finalize.c | ||
| cxa_thread_atexit_impl.c | ||
| dbl2mpn.c | ||
| Depend | ||
| div.c | ||
| divmod_1.c | ||
| divrem.c | ||
| drand48_r.c | ||
| drand48-iter.c | ||
| drand48.c | ||
| erand48_r.c | ||
| erand48.c | ||
| errno.h | ||
| exit.c | ||
| exit.h | ||
| fmtmsg.c | ||
| fmtmsg.h | ||
| fpioconst.c | ||
| fpioconst.h | ||
| gen-fpioconst.c | ||
| gen-tst-strtod-round.c | ||
| getcontext.c | ||
| getenv.c | ||
| getsubopt.c | ||
| gmp-impl.h | ||
| gmp.h | ||
| grouping.c | ||
| grouping.h | ||
| groupingwc.c | ||
| inlines.c | ||
| isomac.c | ||
| jrand48_r.c | ||
| jrand48.c | ||
| l64a.c | ||
| labs.c | ||
| lcong48_r.c | ||
| lcong48.c | ||
| ldbl2mpn.c | ||
| ldiv.c | ||
| llabs.c | ||
| lldiv.c | ||
| longlong.h | ||
| lrand48_r.c | ||
| lrand48.c | ||
| lshift.c | ||
| makecontext.c | ||
| Makefile | ||
| mblen.c | ||
| mbstowcs.c | ||
| mbtowc.c | ||
| mod_1.c | ||
| monetary.h | ||
| mp_clz_tab.c | ||
| mpn2dbl.c | ||
| mpn2flt.c | ||
| mpn2ldbl.c | ||
| mrand48_r.c | ||
| mrand48.c | ||
| msort.c | ||
| mul_1.c | ||
| mul_n.c | ||
| mul.c | ||
| nrand48_r.c | ||
| nrand48.c | ||
| old_atexit.c | ||
| on_exit.c | ||
| putenv.c | ||
| qsort.c | ||
| quick_exit.c | ||
| rand_r.c | ||
| rand.c | ||
| random_r.c | ||
| random.c | ||
| rpmatch.c | ||
| rshift.c | ||
| secure-getenv.c | ||
| seed48_r.c | ||
| seed48.c | ||
| setcontext.c | ||
| setenv.c | ||
| srand48_r.c | ||
| srand48.c | ||
| stdlib.h | ||
| strfmon_l.c | ||
| strfmon.c | ||
| strtod_l.c | ||
| strtod.c | ||
| strtof_l.c | ||
| strtof.c | ||
| strtoimax.c | ||
| strtol_l.c | ||
| strtol.c | ||
| strtold_l.c | ||
| strtold.c | ||
| strtoll_l.c | ||
| strtoll.c | ||
| strtoul_l.c | ||
| strtoul.c | ||
| strtoull_l.c | ||
| strtoull.c | ||
| strtoumax.c | ||
| sub_n.c | ||
| submul_1.c | ||
| swapcontext.c | ||
| system.c | ||
| tens_in_limb.c | ||
| test-a64l.c | ||
| test-canon2.c | ||
| test-canon.c | ||
| testdiv.c | ||
| testdiv.input | ||
| testmb2.c | ||
| testmb.c | ||
| testrand.c | ||
| testsort.c | ||
| tst-atof1.c | ||
| tst-atof2.c | ||
| tst-bsearch.c | ||
| tst-environ.c | ||
| tst-fmtmsg.c | ||
| tst-fmtmsg.sh | ||
| tst-limits.c | ||
| tst-makecontext2.c | ||
| tst-makecontext3.c | ||
| tst-makecontext.c | ||
| tst-putenv.c | ||
| tst-putenvmod.c | ||
| tst-qsort2.c | ||
| tst-qsort.c | ||
| tst-rand48-2.c | ||
| tst-rand48.c | ||
| tst-random2.c | ||
| tst-random.c | ||
| tst-secure-getenv.c | ||
| tst-setcontext.c | ||
| tst-strtod2.c | ||
| tst-strtod3.c | ||
| tst-strtod4.c | ||
| tst-strtod5.c | ||
| tst-strtod6.c | ||
| tst-strtod-overflow.c | ||
| tst-strtod-round-data | ||
| tst-strtod-round.c | ||
| tst-strtod-underflow.c | ||
| tst-strtod.c | ||
| tst-strtol.c | ||
| tst-strtoll.c | ||
| tst-system.c | ||
| tst-tininess.c | ||
| tst-tls-atexit-lib.c | ||
| tst-tls-atexit.c | ||
| tst-unsetenv1.c | ||
| tst-xpg-basename.c | ||
| ucontext.h | ||
| udiv_qrnnd.c | ||
| Versions | ||
| wcstoimax.c | ||
| wcstombs.c | ||
| wcstoumax.c | ||
| wctomb.c | ||
| xpg_basename.c | ||