mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08: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 | ||
| __fbufsize.c | ||
| __flbf.c | ||
| __fpending.c | ||
| __fpurge.c | ||
| __freadable.c | ||
| __freading.c | ||
| __fsetlocking.c | ||
| __fwritable.c | ||
| __fwriting.c | ||
| bug-fopena+.c | ||
| bug-fseek.c | ||
| bug-ftell.c | ||
| bug-memstream1.c | ||
| bug-mmap-fflush.c | ||
| bug-rewind2.c | ||
| bug-rewind.c | ||
| bug-ungetc2.c | ||
| bug-ungetc3.c | ||
| bug-ungetc4.c | ||
| bug-ungetc.c | ||
| bug-ungetwc1.c | ||
| bug-ungetwc2.c | ||
| bug-wfflush.c | ||
| bug-wmemstream1.c | ||
| bug-wsetpos.c | ||
| clearerr_u.c | ||
| clearerr.c | ||
| Depend | ||
| fcloseall.c | ||
| feof_u.c | ||
| feof.c | ||
| ferror_u.c | ||
| ferror.c | ||
| filedoalloc.c | ||
| fileno.c | ||
| fileops.c | ||
| fmemopen.c | ||
| fputc_u.c | ||
| fputc.c | ||
| fputwc_u.c | ||
| fputwc.c | ||
| freopen64.c | ||
| freopen.c | ||
| fseek.c | ||
| fseeko64.c | ||
| fseeko.c | ||
| ftello64.c | ||
| ftello.c | ||
| fwide.c | ||
| fwprintf.c | ||
| fwscanf.c | ||
| genops.c | ||
| getc_u.c | ||
| getc.c | ||
| getchar_u.c | ||
| getchar.c | ||
| getwc_u.c | ||
| getwc.c | ||
| getwchar_u.c | ||
| getwchar.c | ||
| iofclose.c | ||
| iofdopen.c | ||
| iofflush_u.c | ||
| iofflush.c | ||
| iofgetpos64.c | ||
| iofgetpos.c | ||
| iofgets_u.c | ||
| iofgets.c | ||
| iofgetws_u.c | ||
| iofgetws.c | ||
| iofopen64.c | ||
| iofopen.c | ||
| iofopncook.c | ||
| iofputs_u.c | ||
| iofputs.c | ||
| iofputws_u.c | ||
| iofputws.c | ||
| iofread_u.c | ||
| iofread.c | ||
| iofsetpos64.c | ||
| iofsetpos.c | ||
| ioftell.c | ||
| iofwide.c | ||
| iofwrite_u.c | ||
| iofwrite.c | ||
| iogetdelim.c | ||
| iogetline.c | ||
| iogets.c | ||
| iogetwline.c | ||
| iolibio.h | ||
| iopadn.c | ||
| iopopen.c | ||
| ioputs.c | ||
| ioseekoff.c | ||
| ioseekpos.c | ||
| iosetbuffer.c | ||
| iosetvbuf.c | ||
| ioungetc.c | ||
| ioungetwc.c | ||
| iovdprintf.c | ||
| iovsprintf.c | ||
| iovsscanf.c | ||
| iovswscanf.c | ||
| iowpadn.c | ||
| libc_fatal.c | ||
| libio.h | ||
| libioP.h | ||
| Makefile | ||
| memstream.c | ||
| obprintf.c | ||
| oldfileops.c | ||
| oldiofclose.c | ||
| oldiofdopen.c | ||
| oldiofgetpos64.c | ||
| oldiofgetpos.c | ||
| oldiofopen.c | ||
| oldiofsetpos64.c | ||
| oldiofsetpos.c | ||
| oldiopopen.c | ||
| oldpclose.c | ||
| oldstdfiles.c | ||
| oldtmpfile.c | ||
| pclose.c | ||
| peekc.c | ||
| putc_u.c | ||
| putc.c | ||
| putchar_u.c | ||
| putchar.c | ||
| putwc_u.c | ||
| putwc.c | ||
| putwchar_u.c | ||
| putwchar.c | ||
| rewind.c | ||
| setbuf.c | ||
| setlinebuf.c | ||
| stdfiles.c | ||
| stdio.c | ||
| stdio.h | ||
| strfile.h | ||
| strops.c | ||
| swprintf.c | ||
| swscanf.c | ||
| test-fmemopen.c | ||
| test-freopen.c | ||
| test-freopen.sh | ||
| tst_getwc.c | ||
| tst_getwc.input | ||
| tst_putwc.c | ||
| tst_swprintf.c | ||
| tst_swscanf.c | ||
| tst_wprintf2.c | ||
| tst_wprintf.c | ||
| tst_wscanf.c | ||
| tst_wscanf.input | ||
| tst-atime.c | ||
| tst-eof.c | ||
| tst-ext2.c | ||
| tst-ext.c | ||
| tst-fgetwc.c | ||
| tst-fgetwc.input | ||
| tst-fgetws.c | ||
| tst-fopenloc2.c | ||
| tst-fopenloc.c | ||
| tst-freopen.c | ||
| tst-fseek.c | ||
| tst-ftell-active-handler.c | ||
| tst-ftell-append.c | ||
| tst-ftell-partial-wide.c | ||
| tst-fwrite-error.c | ||
| tst-memstream1.c | ||
| tst-memstream2.c | ||
| tst-mmap2-eofsync.c | ||
| tst-mmap-eofsync.c | ||
| tst-mmap-fflushsync.c | ||
| tst-mmap-offend.c | ||
| tst-mmap-setvbuf.c | ||
| tst-popen1.c | ||
| tst-setvbuf1.c | ||
| tst-sscanf.c | ||
| tst-swscanf.c | ||
| tst-ungetwc1.c | ||
| tst-ungetwc2.c | ||
| tst-widetext.c | ||
| tst-widetext.input | ||
| tst-wmemstream1.c | ||
| tst-wmemstream2.c | ||
| vasprintf.c | ||
| Versions | ||
| vscanf.c | ||
| vsnprintf.c | ||
| vswprintf.c | ||
| vwprintf.c | ||
| vwscanf.c | ||
| wfiledoalloc.c | ||
| wfileops.c | ||
| wgenops.c | ||
| wmemstream.c | ||
| wprintf.c | ||
| wscanf.c | ||
| wstrops.c | ||