Fix fallback value of LOCALE_ZH_CN.

diff --git a/ChangeLog b/ChangeLog
index 821636fb32d636cbf2af5133344c4b7ea0611327..fec9492ee4f308b41d6ad7b645ba3cc241337141 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/tests/test-mbrtowc4.sh b/tests/test-mbrtowc4.sh
index 17649115faf12ade39bc65a50192d9ed4d76d689..b299a2c48e2ca9e7894f7e19b5e49843f4d9dc2f 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 49e07b3f1a2cc4a74a93bbc84932d84636b9521a..e43a6a34ff16cbf6cb3e7b92553d0c2b8769a551 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 0708fe6320a5d188667de553458cee8407f8a6e6..226d6ff477613e4fdb8a72abf807599c10fc1dfc 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 32f0b77828c6de5d86f1998b73a1ca4b005d80b5..3eda8f338c2519ae1e49e0adab253df8ff7de6b2 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 4098f40ea062d8d776fc7dc04ca8834aaedbeeb2..c8a02ce250a5ad245ab440c04d0c1f74a4c00f84 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 a5b9f770fcf8450ab5911a15956a33bfceb2ea62..4cff704fb301b2a3a21ea08a660ef53af132893f 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"