From 7fb29192b30f33eeb49e959a92c97bf61afddc83 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 Jan 2012 23:32:36 +0100 Subject: [PATCH] setlocale tests: Avoid test failure on Solaris 11 2011-11. * tests/test-setlocale2.sh: Use 'env' to set the LC_ALL environment variable. --- ChangeLog | 6 ++++++ tests/test-setlocale2.sh | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index af51f88e3..08468ce6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-01-08 Bruno Haible + setlocale tests: Avoid test failure on Solaris 11 2011-11. + * tests/test-setlocale2.sh: Use 'env' to set the LC_ALL environment + variable. + +2012-01-08 Bruno Haible + posix_spawn_file_actions_addopen: Work around Solaris 11 2011-11 bug. * m4/spawn_h.m4 (gl_SPAWN_H_DEFAULTS): Initialize REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. diff --git a/tests/test-setlocale2.sh b/tests/test-setlocale2.sh index 723e74e76..904e147f4 100755 --- a/tests/test-setlocale2.sh +++ b/tests/test-setlocale2.sh @@ -2,14 +2,16 @@ # Test locale names with likely unsupported encoding in Unix syntax. for name in ar_SA.ISO-8859-1 fr_FR.CP1251 zh_TW.GB18030 zh_CN.BIG5; do - LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1 + env LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1 done # Test locale names with likely unsupported encoding in native Windows syntax. for name in "Arabic_Saudi Arabia.1252" "Arabic_Saudi Arabia.65001" \ French_France.65001 Japanese_Japan.65001 Turkish_Turkey.65001 \ Chinese_Taiwan.65001 Chinese_China.54936 Chinese_China.65001; do - LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1 + # Here we use 'env' to set the LC_ALL environment variable, because on + # Solaris 11 2011-11, the /bin/sh refuses to do it for Turkish_Turkey.65001. + env LC_ALL="$name" ./test-setlocale2${EXEEXT} 1 || exit 1 done exit 0 -- 2.11.0