Have -nocrlflinebreaks apply to the message parts that -decodetypes

[nmh] / test / pick / test-pick

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 7c3896ea3c7911ae97273bb519fc6b63a64b8953..ca19bb8870bc43650a1ebfd61e3be40af5379a39 100755 (executable)
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -49,6 +49,12 @@ run_test 'pick -not -subject message.8 last:5' '7
 10
 11'
 
 10
 11'
 

+# Test -reverse.
+run_test 'pick -reverse -not -subject message.8 last:5' '11
+10
+9
+7'
+

 # Test -lbrace, -rbrace.
 run_test 'pick -subject message.12 -and -subject message.3 -or -from Test4' '4'
 run_test 'pick -subject message.12 -and -lbrace -subject message.3 -rbrace' \
 # Test -lbrace, -rbrace.
 run_test 'pick -subject message.12 -and -subject message.3 -or -from Test4' '4'
 run_test 'pick -subject message.12 -and -lbrace -subject message.3 -rbrace' \


@@ -76,10 +82,9 @@ run_test 'pick -not -lbrace -subject NoMatch -and -subject message.3 -rbrace' \
 10
 11'
 
 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
 cat >"$expected" <<EOF
 NOT
 | AND


@@ -262,7 +267,7 @@ echo 13 >"$expected"
 
 set +e
 
 
 set +e
 

-require_locale en_US.utf8
+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
 # 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