From 04181f8456b933ef6d759149fb649428e44285a2 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sat, 25 Feb 2012 20:27:33 -0500 Subject: [PATCH] Fix "setlocale: LC_TIME: cannot change locale (en_US" warning during tests. Both 'en_US' and 'en_US.utf8' might be defined on some platforms From pbatard branch. --- test/check_common_fn.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/check_common_fn.in b/test/check_common_fn.in index f1d5a28f..51bc9525 100755 --- a/test/check_common_fn.in +++ b/test/check_common_fn.in @@ -21,7 +21,8 @@ SKIP_TEST_EXITCODE=77 # Some output changes depending on TZ and locale. Set this so we get known # results TZ=CUT -LC_TIME=$(locale -a | grep 'en_US' &2>/dev/null) +# both 'en_US' and 'en_US.utf8' might be defined on some platforms +LC_TIME=$(locale -a | grep 'en_US' | grep -v 'utf8' &2>/dev/null) export TZ LC_TIME check_result() {