From: Pádraig Brady Date: Tue, 15 Nov 2016 21:27:31 +0000 (+0000) Subject: tests: fix false failure on OS X X-Git-Tag: v8.26~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23a166d0e732b1a7b53848411635ca51844920a0;p=thirdparty%2Fcoreutils.git tests: fix false failure on OS X * tests/misc/sort-h-thousands-sep.sh: The sv_SE locale may be available while sv_SE.utf8 is not. Therefore test and use the same locale, now definfed in a variable. Reported by Jim Meyering. --- diff --git a/tests/misc/sort-h-thousands-sep.sh b/tests/misc/sort-h-thousands-sep.sh index 3ffa89eeb2..f14927ca29 100755 --- a/tests/misc/sort-h-thousands-sep.sh +++ b/tests/misc/sort-h-thousands-sep.sh @@ -19,8 +19,10 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort -test "$(LC_ALL=sv_SE locale thousands_sep)" = ' ' \ - || skip_ 'The Swedish locale with blank thousands separator is unavailable.' +TEST_LOCALE='sv_SE' + +test "$(LC_ALL="$TEST_LOCALE" locale thousands_sep)" = ' ' || + skip_ 'The Swedish locale with blank thousands separator is unavailable.' tee exp1 exp3 > in << _EOF_ 1 1k 1 M 4 003 1M @@ -41,7 +43,7 @@ cat > exp5 << _EOF_ _EOF_ for i in 1 2 3 5; do - LC_ALL="sv_SE.utf8" sort -h -k $i "in" > "out${i}" || fail=1 + LC_ALL="$TEST_LOCALE" sort -h -k $i "in" > "out${i}" || fail=1 compare "exp${i}" "out${i}" || fail=1 done