Add compilation guard around lkopen_flock.

[nmh] / test / pick / test-pick

diff --git a/test/pick/test-pick b/test/pick/test-pick
index ac1978379daf8e08977203f27be2ea07ef62cd5b..e1434dcef5ef359cb767cb66490040bb6164540e 100755 (executable)
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -99,14 +99,12 @@ cat >"$expected" <<EOF
 EOF
 check "$expected" "$actual"
 
 EOF
 check "$expected" "$actual"
 

-if test -w /dev/tty && printf '' >/dev/tty; 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
   # 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"

 fi
 
 # Also, check that the exit status is 1.
 fi
 
 # Also, check that the exit status is 1.


@@ -258,8 +256,17 @@ EOF
 
 echo 13 >"$expected"
 
 
 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"
 
 check "$expected" "$actual"
 

+# Test -nosequence.
+run_test 'pick +inbox 5 7 9 11 -sequence test -nosequence' '5
+7
+9
+11'
+run_test 'mark -list -sequence test' 'test: '
+

 
 exit $failed
 
 exit $failed