X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/65e777c88d3bff1c9610076b40da04c8899ea05e..4bd22a06b574acbafff8e6bd9bde5fd6bb048946:/test/pick/test-pick

diff --git a/test/pick/test-pick b/test/pick/test-pick
index f75e203b..858d8e75 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -76,10 +76,9 @@ run_test 'pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace' \
 10
 11'
 
-# Test MHPDEBUG.
-# Don't use run_prog here because it loses the environment setting.
-MHPDEBUG=1 pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace \
- >/dev/null 2>"$actual"
+# Test -debug.
+run_prog pick -debug -not -lbrace -subject NoMatch -and -subject message.3 \
+  -rbrace >/dev/null 2>"$actual"
 cat >"$expected" <<EOF
 NOT
 | AND
@@ -262,8 +261,9 @@ echo 13 >"$expected"
 
 set +e
 
+require_locale en_US.utf-8 en_US.utf8
 # Don't use run_prog here because it loses the environment setting.
-LC_CTYPE=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
+LC_ALL=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
 set -e
 check "$expected" "$actual"