Fix to commit 0d3875d020fb17d34918f5e81ee7f87fbc5d1565: it seems

[nmh] / test / pick / test-pick

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 07eff1ffb3f32dbceb5f7c18ce956a4c860dc03e..4eff47cbbf01fa3b32549fff417de1f0c58d70ad 100755 (executable)
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -77,6 +77,7 @@ run_test 'pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace' \
 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"
 cat >"$expected" <<EOF
@@ -92,23 +93,24 @@ set +e
 # Produce 0 if no messages match and standard output is not a tty.
 # Note that there is an error message on stderr, but it's redirected
 # to /dev/null here.
-echo `pick -subject message.3 -and -from Test4 >"$actual" 2>/dev/null` \
+echo \
+  `run_prog pick -subject message.3 -and -from Test4 >"$actual" 2>/dev/null` \
   >/dev/null
 cat >"$expected" <<EOF
 0
 EOF
 check "$expected" "$actual"
 
-if test -w /dev/tty  &&  (printf '' >/dev/tty) 2>/dev/null; then
+if test -t 1  &&  (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
+  run_prog pick -subject message.3 -and -from Test4 >/dev/tty 2>/dev/null
 fi
 
 # Also, check that the exit status is 1.
-pick -subject message.3 -and -from Test4 >/dev/null 2>&1
+run_prog pick -subject message.3 -and -from Test4 >/dev/null 2>&1
 run_test "echo $?" '1'
 
 set -e
@@ -135,7 +137,7 @@ run_test 'pick -to some -nolist' '11 hits'
 run_test 'pick -to user@example.com -nolist' '11 hits'
 
 # Test -after.
-pick -after '28 Sep 2008 00:00:00' >"$actual" 2>&1
+run_prog pick -after '28 Sep 2008 00:00:00' >"$actual" 2>&1
 cat >"$expected" <<EOF
 11
 EOF
@@ -143,7 +145,7 @@ check "$expected" "$actual"
 
 # Invert exit status so execution doesn't terminate due to -e.
 set +e
-pick -after '29 Sep 2008 00:00:00' >"$actual" 2>/dev/null
+run_prog pick -after '29 Sep 2008 00:00:00' >"$actual" 2>/dev/null
 set -e
 cat >"$expected" <<EOF
 0
@@ -151,21 +153,21 @@ EOF
 check "$expected" "$actual"
 
 # Test -before.  While -after doesn't include the specified date, -before does.
-pick -before '29 Sep 2008 00:00:01' last:3 >"$actual" 2>&1
+run_prog pick -before '29 Sep 2008 00:00:01' last:3 >"$actual" 2>&1
 cat >"$expected" <<EOF
 9
 10
 11
 EOF
 check "$expected" "$actual"
-pick -before '28 Sep 2008 00:00:00:' last:3 >"$actual" 2>&1
+run_prog pick -before '28 Sep 2008 00:00:00:' last:3 >"$actual" 2>&1
 cat >"$expected" <<EOF
 9
 10
 EOF
 check "$expected" "$actual"
 set +e
-pick -before '28 Sep 2006 00:00:00' last:3 >"$actual" 2>/dev/null
+run_prog pick -before '28 Sep 2006 00:00:00' last:3 >"$actual" 2>/dev/null
 set -e
 cat >"$expected" <<EOF
 0
@@ -174,13 +176,15 @@ check "$expected" "$actual"
 
 # Test -datefield.
 set +e
-pick -datefield date -after '29 Sep 2008 00:00:00' >"$actual" 2>/dev/null
+run_prog pick -datefield date -after '29 Sep 2008 00:00:00' \
+  >"$actual" 2>/dev/null
 set -e
 cat >"$expected" <<EOF
 0
 EOF
 check "$expected" "$actual"
-pick -datefield delivery-date -after '29 Sep 2008 00:00:00' >"$actual" 2>&1
+run_prog pick -datefield delivery-date -after '29 Sep 2008 00:00:00' \
+  >"$actual" 2>&1
 cat >"$expected" <<EOF
 11
 EOF
@@ -239,7 +243,7 @@ EOF
 
 echo 12 >"$expected"
 
-pick -subject 'multi-line header field' 12 >"$actual" 2>&1
+run_prog pick -subject 'multi-line header field' 12 >"$actual" 2>&1
 check "$expected" "$actual"
 
 # Test MIME-encoded header.
@@ -257,7 +261,10 @@ EOF
 echo 13 >"$expected"
 
 set +e
-LC_CTYPE=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
+
+require_locale en_US.utf-8 en_US.utf8
+# Don't use run_prog here because it loses the environment setting.
+LC_ALL=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
 set -e
 check "$expected" "$actual"