X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpick%2Ftest-pick;h=9b737ceca7b2a3fd7dc02a109045e8029a335e94;hb=90986dddba4b24b0449238f86f836581cfb93938;hp=8df115f80822deed923fa218b3d42ffd1afce863;hpb=843dc603e9b9862206461a59cb364153a9320f37;p=mmh

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 8df115f..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,10 +98,7 @@ cat >$expected <<EOF
 EOF
 check $expected $actual
 
-
-set +e
-
-if test -w /dev/tty; then
+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
@@ -145,7 +143,9 @@ 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
@@ -165,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