Fix fallback value of LOCALE_ZH_CN.

diff --git a/ChangeLog b/ChangeLog
index 821636f..fec9492 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-02-07  Bruno Haible  <bruno@clisp.org>
 
+       * 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  <bruno@clisp.org>
+
        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 1764911..b299a2c 100755 (executable)
--- 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 49e07b3..e43a6a3 100755 (executable)
--- 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 0708fe6..226d6ff 100755 (executable)
--- 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 32f0b77..3eda8f3 100755 (executable)
--- 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 4098f40..c8a02ce 100755 (executable)
--- 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 a5b9f77..4cff704 100755 (executable)
--- 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"