diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 67 | ||||
| -rw-r--r-- | localedata/Makefile | 73 |
2 files changed, 70 insertions, 70 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 35dd877..7fc5eb1 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,70 @@ +2014-06-05 Joseph Myers <joseph@codesourcery.com> + + * 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. + 2014-05-21 Joseph Myers <joseph@codesourcery.com> * Makefile (LOCALEDEF): Use $(elf-objpfx) instead of diff --git a/localedata/Makefile b/localedata/Makefile index d7ab445..20da00c 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -236,82 +236,15 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ -# The mbwc-tests need some environment setup to find the locale data files -TEST_MBWC_ENV:= LOCPATH=$(common-objpfx)localedata -tst_iswalnum-ENV = $(TEST_MBWC_ENV) -tst_iswalpha-ENV = $(TEST_MBWC_ENV) -tst_iswcntrl-ENV = $(TEST_MBWC_ENV) -tst_iswctype-ENV = $(TEST_MBWC_ENV) -tst_iswdigit-ENV = $(TEST_MBWC_ENV) -tst_iswgraph-ENV = $(TEST_MBWC_ENV) -tst_iswlower-ENV = $(TEST_MBWC_ENV) -tst_iswprint-ENV = $(TEST_MBWC_ENV) -tst_iswpunct-ENV = $(TEST_MBWC_ENV) -tst_iswspace-ENV = $(TEST_MBWC_ENV) -tst_iswupper-ENV = $(TEST_MBWC_ENV) -tst_iswxdigit-ENV = $(TEST_MBWC_ENV) -tst_mblen-ENV = $(TEST_MBWC_ENV) -tst_mbrlen-ENV = $(TEST_MBWC_ENV) -tst_mbrtowc-ENV = $(TEST_MBWC_ENV) -tst_mbsrtowcs-ENV = $(TEST_MBWC_ENV) -tst_mbstowcs-ENV = $(TEST_MBWC_ENV) -tst_mbtowc-ENV = $(TEST_MBWC_ENV) -tst_strcoll-ENV = $(TEST_MBWC_ENV) -tst_strfmon-ENV = $(TEST_MBWC_ENV) -tst_strxfrm-ENV = $(TEST_MBWC_ENV) -tst_swscanf-ENV = $(TEST_MBWC_ENV) -tst_towctrans-ENV = $(TEST_MBWC_ENV) -tst_towlower-ENV = $(TEST_MBWC_ENV) -tst_towupper-ENV = $(TEST_MBWC_ENV) -tst_wcrtomb-ENV = $(TEST_MBWC_ENV) -tst_wcscat-ENV = $(TEST_MBWC_ENV) -tst_wcschr-ENV = $(TEST_MBWC_ENV) -tst_wcscmp-ENV = $(TEST_MBWC_ENV) -tst_wcscoll-ENV = $(TEST_MBWC_ENV) -tst_wcscpy-ENV = $(TEST_MBWC_ENV) -tst_wcscspn-ENV = $(TEST_MBWC_ENV) -tst_wcslen-ENV = $(TEST_MBWC_ENV) -tst_wcsncat-ENV = $(TEST_MBWC_ENV) -tst_wcsncmp-ENV = $(TEST_MBWC_ENV) -tst_wcsncpy-ENV = $(TEST_MBWC_ENV) -tst_wcspbrk-ENV = $(TEST_MBWC_ENV) -tst_wcsrtombs-ENV = $(TEST_MBWC_ENV) -tst_wcsspn-ENV = $(TEST_MBWC_ENV) -tst_wcsstr-ENV = $(TEST_MBWC_ENV) -tst_wcstod-ENV = $(TEST_MBWC_ENV) -tst_wcstok-ENV = $(TEST_MBWC_ENV) -tst_wcstombs-ENV = $(TEST_MBWC_ENV) -tst_wcswidth-ENV = $(TEST_MBWC_ENV) -tst_wcsxfrm-ENV = $(TEST_MBWC_ENV) -tst_wctob-ENV = $(TEST_MBWC_ENV) -tst_wctomb-ENV = $(TEST_MBWC_ENV) -tst_wctrans-ENV = $(TEST_MBWC_ENV) -tst_wctype-ENV = $(TEST_MBWC_ENV) -tst_wcwidth-ENV = $(TEST_MBWC_ENV) -tst-digits-ENV = $(TEST_MBWC_ENV) -tst-mbswcs6-ENV = $(TEST_MBWC_ENV) -tst-xlocale1-ENV = $(TEST_MBWC_ENV) -tst-xlocale2-ENV = $(TEST_MBWC_ENV) -tst-strfmon1-ENV = $(TEST_MBWC_ENV) -tst-strptime-ENV = $(TEST_MBWC_ENV) - -tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP - -bug-iconv-trans-ENV = LOCPATH=$(common-objpfx)localedata - -tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata - -tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \ - LOCPATH=$(common-objpfx)localedata +tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP + +tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@; \ $(evaluate-test) -bug-setlocale1-ENV = LOCPATH=$(common-objpfx)localedata bug-setlocale1-ARGS = -- $(host-test-program-cmd) -bug-setlocale1-static-ENV = $(bug-setlocale1-ENV) bug-setlocale1-static-ARGS = $(bug-setlocale1-ARGS) -tst-setlocale2-ENV = LOCPATH=$(common-objpfx)localedata $(objdir)/iconvdata/gconv-modules: $(MAKE) -C ../iconvdata subdir=iconvdata $@ |