X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/348afa78cbece5f8eb67a120282c50b469fa9849..d231c858d574d37b6cc3d3cef82b06cb04f13b81:/test/pick/test-pick

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 12d2aae0..1c365de4 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -99,14 +99,14 @@ cat >"$expected" <<EOF
 EOF
 check "$expected" "$actual"
 
-if test -w /dev/tty && printf '' >/dev/tty; then
-  # Produce no standard output if no messages match and standard
-  # output is a tty.  To test that even when run with stdout
-  # detached, write directly to /dev/tty.  Can't capture the
-  # output so hopefully the user will notice it.
-  pick -subject message.3 -and -from Test4 >/dev/tty 2>/dev/null
-else
-  echo "$0: skip tty test because can't write to /dev/tty"
+if test -w /dev/tty; then
+  if printf '' >/dev/tty 2>/dev/null; then
+    # Produce no standard output if no messages match and standard
+    # output is a tty.  To test that even when run with stdout
+    # detached, write directly to /dev/tty.  Can't capture the
+    # output so hopefully the user will notice it.
+    pick -subject message.3 -and -from Test4 >/dev/tty 2>/dev/null
+  fi
 fi
 
 # Also, check that the exit status is 1.
@@ -258,7 +258,9 @@ EOF
 
 echo 13 >"$expected"
 
-pick -subject foobar 13 >"$actual" 2>&1
+set +e
+LC_CTYPE=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
+set -e
 check "$expected" "$actual"
 
 # Test -nosequence.