From bda467cd6c5d3cf3dc5afa09c841e794732fadca Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Feb 2009 22:29:08 +0100 Subject: [PATCH] Fix fallback value of LOCALE_ZH_CN. --- ChangeLog | 9 +++++++++ tests/test-mbrtowc4.sh | 2 +- tests/test-mbsnrtowcs4.sh | 2 +- tests/test-mbsrtowcs4.sh | 2 +- tests/test-wcrtomb.sh | 2 +- tests/test-wcsnrtombs4.sh | 2 +- tests/test-wcsrtombs4.sh | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 821636fb3..fec9492ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-02-07 Bruno Haible + * test-mbrtowc4.sh (LOCALE_ZH_CN): Fix default value. + * test-mbsnrtowcs4.sh (LOCALE_ZH_CN): Likewise. + * test-mbsrtowcs4.sh (LOCALE_ZH_CN): Likewise. + * test-wcrtomb.sh (LOCALE_ZH_CN): Likewise. + * test-wcsnrtombs4.sh (LOCALE_ZH_CN): Likewise. + * test-wcsrtombs4.sh (LOCALE_ZH_CN): Likewise. + +2009-02-07 Bruno Haible + Make 64-bit clean. * lib/unictype/gen-ctype.c (output_predicate, output_category, output_combclass, output_bidi_category, output_decimal_digit, diff --git a/tests/test-mbrtowc4.sh b/tests/test-mbrtowc4.sh index 17649115f..b299a2c48 100755 --- a/tests/test-mbrtowc4.sh +++ b/tests/test-mbrtowc4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN = none; then if test -f /usr/bin/localedef; then echo "Skipping test: no transitional chinese locale is installed" diff --git a/tests/test-mbsnrtowcs4.sh b/tests/test-mbsnrtowcs4.sh index 49e07b3f1..e43a6a34f 100755 --- a/tests/test-mbsnrtowcs4.sh +++ b/tests/test-mbsnrtowcs4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN = none; then if test -f /usr/bin/localedef; then echo "Skipping test: no transitional chinese locale is installed" diff --git a/tests/test-mbsrtowcs4.sh b/tests/test-mbsrtowcs4.sh index 0708fe632..226d6ff47 100755 --- a/tests/test-mbsrtowcs4.sh +++ b/tests/test-mbsrtowcs4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN = none; then if test -f /usr/bin/localedef; then echo "Skipping test: no transitional chinese locale is installed" diff --git a/tests/test-wcrtomb.sh b/tests/test-wcrtomb.sh index 32f0b7782..3eda8f338 100755 --- a/tests/test-wcrtomb.sh +++ b/tests/test-wcrtomb.sh @@ -25,7 +25,7 @@ if test $LOCALE_JA != none; then fi # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN != none; then LC_ALL=$LOCALE_ZH_CN \ ./test-wcrtomb${EXEEXT} 4 \ diff --git a/tests/test-wcsnrtombs4.sh b/tests/test-wcsnrtombs4.sh index 4098f40ea..c8a02ce25 100755 --- a/tests/test-wcsnrtombs4.sh +++ b/tests/test-wcsnrtombs4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN = none; then if test -f /usr/bin/localedef; then echo "Skipping test: no transitional chinese locale is installed" diff --git a/tests/test-wcsrtombs4.sh b/tests/test-wcsrtombs4.sh index a5b9f770f..4cff704fb 100755 --- a/tests/test-wcsrtombs4.sh +++ b/tests/test-wcsrtombs4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether a specific GB18030 locale is installed. -: ${LOCALE_ZH_CN=zh_CN} +: ${LOCALE_ZH_CN=zh_CN.GB18030} if test $LOCALE_ZH_CN = none; then if test -f /usr/bin/localedef; then echo "Skipping test: no transitional chinese locale is installed" -- 2.11.0