X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpick%2Ftest-pick;h=9b737ceca7b2a3fd7dc02a109045e8029a335e94;hb=25e812757fa325d017b47144923dcad62b66399d;hp=2396811bc28121703c8d160fab21cda07a869797;hpb=80b2767e802566662044eee232384b1f95dc6b61;p=mmh

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 2396811..9b737ce 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -87,6 +87,7 @@ NOT
 EOF
 check $expected $actual
 
+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
@@ -97,18 +98,20 @@ cat >$expected <<EOF
 EOF
 check $expected $actual
 
-# Produce no standard output if no messages match and standard output
-# is a tty.  To test that, move stderr to stdout.
-echo `pick -subject message.3 -and -from Test4 >&2-` >$actual
-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"
+fi
 
 # Also, check that the exit status is 1.
-set +e
-pick -subject message.3 -and -from Test4 2>/dev/null
+pick -subject message.3 -and -from Test4 >/dev/null 2>&1
 run_test "echo $?" '1'
+
 set -e
 
 # Test -cc.
@@ -137,10 +140,12 @@ pick -after '28 Sep 2008 00:00:00' >$actual 2>&1
 cat >$expected <<EOF
 11
 EOF
-
 check $expected $actual
+
 # Invert exit status so execution doesn't terminate due to -e.
-! pick -after '29 Sep 2008 00:00:00' >$actual 2>/dev/null
+set +e
+pick -after '29 Sep 2008 00:00:00' >$actual 2>/dev/null
+set -e
 cat >$expected <<EOF
 0
 EOF
@@ -160,16 +165,18 @@ cat >$expected <<EOF
 10
 EOF
 check $expected $actual
-# Invert exit status so execution doesn't terminate due to -e.
-! pick -before '28 Sep 2006 00:00:00' last:3 >$actual 2>/dev/null
+set +e
+pick -before '28 Sep 2006 00:00:00' last:3 >$actual 2>/dev/null
+set -e
 cat >$expected <<EOF
 0
 EOF
 check $expected $actual
 
 # Test -datefield.
-# Invert exit status so execution doesn't terminate due to -e.
-! pick -datefield date -after '29 Sep 2008 00:00:00' >$actual 2>/dev/null
+set +e
+pick -datefield date -after '29 Sep 2008 00:00:00' >$actual 2>/dev/null
+set -e
 cat >$expected <<EOF
 0
 EOF