From a6d580a7c50bdc2ec1e4d4fc4e57acc3f6311896 Mon Sep 17 00:00:00 2001 From: John Hood Date: Thu, 18 May 2017 23:22:55 -0400 Subject: [PATCH] Set locale more correctly in tests This fixes Debian builds which only have LC_ALL=POSIX set. --- src/tests/e2e-test-subrs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/e2e-test-subrs b/src/tests/e2e-test-subrs index a149dca..958c9b7 100644 --- a/src/tests/e2e-test-subrs +++ b/src/tests/e2e-test-subrs @@ -70,9 +70,10 @@ set_locale() return 0 fi # Attempt to find/set a usable locale. + unset LANG LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL for i in en_US.UTF-8 en_US.utf8 C.UTF-8; do - if env LANG=$i ./is-utf8-locale 2> /dev/null; then - export LANG=$i LC_ALL='' + if env LC_ALL=$i ./is-utf8-locale 2> /dev/null; then + export LC_ALL=$i return 0 fi done