From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Feb 2009 21:29:08 +0000 (+0100)
Subject: Fix fallback value of LOCALE_ZH_CN.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda467cd6c5d3cf3dc5afa09c841e794732fadca;p=pspp

Fix fallback value of LOCALE_ZH_CN.
---

diff --git a/ChangeLog b/ChangeLog
index 821636fb32..fec9492ee4 100644
--- 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 17649115fa..b299a2c48e 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 49e07b3f1a..e43a6a34ff 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 0708fe6320..226d6ff477 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 32f0b77828..3eda8f338c 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 4098f40ea0..c8a02ce250 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 a5b9f770fc..4cff704fb3 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"