# HG changeset patch # User Bruno Haible # Date 1326061956 -3600 # Node ID 51e5394036c696d2cce20d4d062541e00397fcef # Parent a5001764146b15f287462e2521373a0ba09176b5 setlocale tests: Avoid test failure on Solaris 11 2011-11. * tests/test-setlocale2.sh: Use 'env' to set the LC_ALL environment variable. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/tests/test-setlocale2.sh b/tests/test-setlocale2.sh --- 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