From a8803658e85d3b0be6ca0806d58e6bccbeb67c70 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 12 Feb 2011 19:09:23 +0100 Subject: [PATCH] Avoid setlocale bugs in tests. * modules/btowc (Dependencies): Add setlocale. * modules/c-strcase (Dependencies): Likewise. * modules/mbmemcasecmp (Dependencies): Likewise. * modules/mbmemcasecoll (Dependencies): Likewise. * modules/mbrtowc (Dependencies): Likewise. * modules/mbscasecmp (Dependencies): Likewise. * modules/mbscasestr (Dependencies): Likewise. * modules/mbschr (Dependencies): Likewise. * modules/mbscspn (Dependencies): Likewise. * modules/mbsinit (Dependencies): Likewise. * modules/mbsncasecmp (Dependencies): Likewise. * modules/mbsnrtowcs (Dependencies): Likewise. * modules/mbspbrk (Dependencies): Likewise. * modules/mbspcasecmp (Dependencies): Likewise. * modules/mbsrchr (Dependencies): Likewise. * modules/mbsrtowcs (Dependencies): Likewise. * modules/mbsspn (Dependencies): Likewise. * modules/mbsstr (Dependencies): Likewise. * modules/nl_langinfo (Dependencies): Likewise. * modules/quotearg (Dependencies): Likewise. * modules/unicase/locale-language (Dependencies): Likewise. * modules/unicase/ulc-casecmp (Dependencies): Likewise. * modules/unicase/ulc-casecoll (Dependencies): Likewise. * modules/unigbrk/ulc-grapheme-breaks (Dependencies): Likewise. * modules/unistdio/u8-vasnprintf (Dependencies): Likewise. * modules/unistdio/u16-vasnprintf (Dependencies): Likewise. * modules/unistdio/u32-vasnprintf (Dependencies): Likewise. * modules/unistdio/ulc-vasnprintf (Dependencies): Likewise. * modules/uniwbrk/ulc-wordbreaks (Dependencies): Likewise. * modules/vasnprintf-posix (Dependencies): Likewise. * modules/wcrtomb (Dependencies): Likewise. * modules/wcsnrtombs (Dependencies): Likewise. * modules/wcsrtombs (Dependencies): Likewise. --- ChangeLog | 37 +++++++++++++++++++++++ modules/btowc-tests | 1 + modules/c-strcase-tests | 1 + modules/mbmemcasecmp-tests | 1 + modules/mbmemcasecoll-tests | 1 + modules/mbrtowc-tests | 1 + modules/mbscasecmp-tests | 1 + modules/mbscasestr-tests | 1 + modules/mbschr-tests | 1 + modules/mbscspn-tests | 1 + modules/mbsinit-tests | 1 + modules/mbsncasecmp-tests | 1 + modules/mbsnrtowcs-tests | 1 + modules/mbspbrk-tests | 1 + modules/mbspcasecmp-tests | 1 + modules/mbsrchr-tests | 1 + modules/mbsrtowcs-tests | 1 + modules/mbsspn-tests | 1 + modules/mbsstr-tests | 1 + modules/nl_langinfo-tests | 1 + modules/quotearg-tests | 1 + modules/unicase/locale-language-tests | 1 + modules/unicase/ulc-casecmp-tests | 1 + modules/unicase/ulc-casecoll-tests | 1 + modules/unigbrk/ulc-grapheme-breaks-tests | 1 + modules/unistdio/u16-vasnprintf-tests | 1 + modules/unistdio/u32-vasnprintf-tests | 1 + modules/unistdio/u8-vasnprintf-tests | 1 + modules/unistdio/ulc-vasnprintf-tests | 1 + modules/uniwbrk/ulc-wordbreaks-tests | 1 + modules/vasnprintf-posix-tests | 1 + modules/wcrtomb-tests | 1 + modules/wcsnrtombs-tests | 1 + modules/wcsrtombs-tests | 1 + 34 files changed, 70 insertions(+) diff --git a/ChangeLog b/ChangeLog index 85ad37d7d5..be1f5acff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2011-02-12 Bruno Haible + + Avoid setlocale bugs in tests. + * modules/btowc (Dependencies): Add setlocale. + * modules/c-strcase (Dependencies): Likewise. + * modules/mbmemcasecmp (Dependencies): Likewise. + * modules/mbmemcasecoll (Dependencies): Likewise. + * modules/mbrtowc (Dependencies): Likewise. + * modules/mbscasecmp (Dependencies): Likewise. + * modules/mbscasestr (Dependencies): Likewise. + * modules/mbschr (Dependencies): Likewise. + * modules/mbscspn (Dependencies): Likewise. + * modules/mbsinit (Dependencies): Likewise. + * modules/mbsncasecmp (Dependencies): Likewise. + * modules/mbsnrtowcs (Dependencies): Likewise. + * modules/mbspbrk (Dependencies): Likewise. + * modules/mbspcasecmp (Dependencies): Likewise. + * modules/mbsrchr (Dependencies): Likewise. + * modules/mbsrtowcs (Dependencies): Likewise. + * modules/mbsspn (Dependencies): Likewise. + * modules/mbsstr (Dependencies): Likewise. + * modules/nl_langinfo (Dependencies): Likewise. + * modules/quotearg (Dependencies): Likewise. + * modules/unicase/locale-language (Dependencies): Likewise. + * modules/unicase/ulc-casecmp (Dependencies): Likewise. + * modules/unicase/ulc-casecoll (Dependencies): Likewise. + * modules/unigbrk/ulc-grapheme-breaks (Dependencies): Likewise. + * modules/unistdio/u8-vasnprintf (Dependencies): Likewise. + * modules/unistdio/u16-vasnprintf (Dependencies): Likewise. + * modules/unistdio/u32-vasnprintf (Dependencies): Likewise. + * modules/unistdio/ulc-vasnprintf (Dependencies): Likewise. + * modules/uniwbrk/ulc-wordbreaks (Dependencies): Likewise. + * modules/vasnprintf-posix (Dependencies): Likewise. + * modules/wcrtomb (Dependencies): Likewise. + * modules/wcsnrtombs (Dependencies): Likewise. + * modules/wcsrtombs (Dependencies): Likewise. + 2011-02-12 Bruno Haible setlocale: Workaround native Windows bug. diff --git a/modules/btowc-tests b/modules/btowc-tests index cac7e616e2..66196b1332 100644 --- a/modules/btowc-tests +++ b/modules/btowc-tests @@ -8,6 +8,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests index aec55d24ca..81d4220bb9 100644 --- a/modules/c-strcase-tests +++ b/modules/c-strcase-tests @@ -8,6 +8,7 @@ m4/locale-tr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests index 05d6c7fee1..e863f6d960 100644 --- a/modules/mbmemcasecmp-tests +++ b/modules/mbmemcasecmp-tests @@ -11,6 +11,7 @@ m4/codeset.m4 Depends-on: stdbool +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests index e2cc524c70..8c834d72f1 100644 --- a/modules/mbmemcasecoll-tests +++ b/modules/mbmemcasecoll-tests @@ -11,6 +11,7 @@ m4/codeset.m4 Depends-on: stdbool +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests index d9c0d183e3..49ae21f624 100644 --- a/modules/mbrtowc-tests +++ b/modules/mbrtowc-tests @@ -14,6 +14,7 @@ m4/codeset.m4 Depends-on: mbsinit wctob +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests index 9e89bfea19..460e998a9f 100644 --- a/modules/mbscasecmp-tests +++ b/modules/mbscasecmp-tests @@ -6,6 +6,7 @@ m4/locale-tr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_TR_UTF8 diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests index 30f091998d..15d5c97493 100644 --- a/modules/mbscasestr-tests +++ b/modules/mbscasestr-tests @@ -13,6 +13,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/mbschr-tests b/modules/mbschr-tests index a26d8dd487..773eb00042 100644 --- a/modules/mbschr-tests +++ b/modules/mbschr-tests @@ -6,6 +6,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_ZH_CN diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests index f31e347944..3052a3b337 100644 --- a/modules/mbscspn-tests +++ b/modules/mbscspn-tests @@ -6,6 +6,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests index 3a8a7a01ac..5225c36675 100644 --- a/modules/mbsinit-tests +++ b/modules/mbsinit-tests @@ -8,6 +8,7 @@ m4/codeset.m4 Depends-on: mbrtowc +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests index 81b8ba913a..1844904ec0 100644 --- a/modules/mbsncasecmp-tests +++ b/modules/mbsncasecmp-tests @@ -6,6 +6,7 @@ m4/locale-tr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_TR_UTF8 diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests index 1d43beb80e..1a53405fb6 100644 --- a/modules/mbsnrtowcs-tests +++ b/modules/mbsnrtowcs-tests @@ -15,6 +15,7 @@ Depends-on: mbrtowc mbsinit wctob +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests index d22cf198bb..77a305af6d 100644 --- a/modules/mbspbrk-tests +++ b/modules/mbspbrk-tests @@ -6,6 +6,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests index 0b1c7d3d24..5f38e22de2 100644 --- a/modules/mbspcasecmp-tests +++ b/modules/mbspcasecmp-tests @@ -6,6 +6,7 @@ m4/locale-tr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_TR_UTF8 diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests index 70d7c206a4..d848037be3 100644 --- a/modules/mbsrchr-tests +++ b/modules/mbsrchr-tests @@ -6,6 +6,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_ZH_CN diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests index 4b05e52f40..74dcd6370d 100644 --- a/modules/mbsrtowcs-tests +++ b/modules/mbsrtowcs-tests @@ -15,6 +15,7 @@ Depends-on: mbrtowc mbsinit wctob +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests index ace5c766a6..ed7e47abb7 100644 --- a/modules/mbsspn-tests +++ b/modules/mbsspn-tests @@ -6,6 +6,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests index 21a8590654..01e605d8f2 100644 --- a/modules/mbsstr-tests +++ b/modules/mbsstr-tests @@ -10,6 +10,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR_UTF8 diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests index dcb0af93c6..2d3fda031c 100644 --- a/modules/nl_langinfo-tests +++ b/modules/nl_langinfo-tests @@ -7,6 +7,7 @@ m4/locale-fr.m4 Depends-on: c-strcase +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/quotearg-tests b/modules/quotearg-tests index 5b71ef99d1..3c37428baf 100644 --- a/modules/quotearg-tests +++ b/modules/quotearg-tests @@ -17,6 +17,7 @@ progname stdint setenv unsetenv +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests index 0b4d147a1e..87f3eaffd1 100644 --- a/modules/unicase/locale-language-tests +++ b/modules/unicase/locale-language-tests @@ -9,6 +9,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests index 8056723c34..0d78fbe256 100644 --- a/modules/unicase/ulc-casecmp-tests +++ b/modules/unicase/ulc-casecmp-tests @@ -9,6 +9,7 @@ m4/codeset.m4 Depends-on: uninorm/nfd +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests index 4b263eaa93..bd2e59b82d 100644 --- a/modules/unicase/ulc-casecoll-tests +++ b/modules/unicase/ulc-casecoll-tests @@ -9,6 +9,7 @@ m4/codeset.m4 Depends-on: uninorm/nfc +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unigbrk/ulc-grapheme-breaks-tests b/modules/unigbrk/ulc-grapheme-breaks-tests index 60cd513f7f..187e26f05b 100644 --- a/modules/unigbrk/ulc-grapheme-breaks-tests +++ b/modules/unigbrk/ulc-grapheme-breaks-tests @@ -6,6 +6,7 @@ m4/locale-ar.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_AR diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests index cf8a929db4..3dc3cb0083 100644 --- a/modules/unistdio/u16-vasnprintf-tests +++ b/modules/unistdio/u16-vasnprintf-tests @@ -15,6 +15,7 @@ unistr/u16-cmp unistr/u16-cpy unistr/u16-strcmp unistr/u16-strlen +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests index 1e9b1e5bd7..555319b4a1 100644 --- a/modules/unistdio/u32-vasnprintf-tests +++ b/modules/unistdio/u32-vasnprintf-tests @@ -15,6 +15,7 @@ unistr/u32-cmp unistr/u32-cpy unistr/u32-strcmp unistr/u32-strlen +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests index 4a29e096d3..8d5e29512d 100644 --- a/modules/unistdio/u8-vasnprintf-tests +++ b/modules/unistdio/u8-vasnprintf-tests @@ -15,6 +15,7 @@ unistr/u8-cmp unistr/u8-cpy unistr/u8-strcmp unistr/u8-strlen +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests index d2fae61592..20e2f71842 100644 --- a/modules/unistdio/ulc-vasnprintf-tests +++ b/modules/unistdio/ulc-vasnprintf-tests @@ -11,6 +11,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests index 82d9ced594..19f1ee6811 100644 --- a/modules/uniwbrk/ulc-wordbreaks-tests +++ b/modules/uniwbrk/ulc-wordbreaks-tests @@ -6,6 +6,7 @@ m4/locale-fr.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests index 5a4800d00f..01f0188fd5 100644 --- a/modules/vasnprintf-posix-tests +++ b/modules/vasnprintf-posix-tests @@ -12,6 +12,7 @@ m4/codeset.m4 Depends-on: stdint float +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests index abedd771a0..4c85b17135 100644 --- a/modules/wcrtomb-tests +++ b/modules/wcrtomb-tests @@ -10,6 +10,7 @@ m4/codeset.m4 Depends-on: btowc +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests index 1745272f9d..877dd17584 100644 --- a/modules/wcsnrtombs-tests +++ b/modules/wcsnrtombs-tests @@ -12,6 +12,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests index 41ec9973e4..4b6bf54172 100644 --- a/modules/wcsrtombs-tests +++ b/modules/wcsrtombs-tests @@ -12,6 +12,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: +setlocale configure.ac: gt_LOCALE_FR -- 2.30.2