X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpick%2Ftest-pick;h=ba7c18bdde123b178388b628eacce204a2640a5c;hb=9ac724c1df34e9dd56e2e35566b0cf81a491e8e6;hp=2396811bc28121703c8d160fab21cda07a869797;hpb=3bede3fae77775088b8b66e7a26a5e2ee1f61fff;p=mmh

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 2396811..ba7c18b 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -97,18 +97,24 @@ 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
+set +e
+
+if test -w /dev/tty; then
+  # Produce no standard output if no messages match and standard
+  # output is a tty.  To test that, move stderr to stdout and
+  # write the output directly to the tty.  If there is output,
+  # it probably won't be captured, but pretend that it would be.
+  output=`pick -subject message.3 -and -from Test4 >&2- >/dev/tty`
+  run_test "echo $output" ''
+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,8 +143,8 @@ 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
 cat >$expected <<EOF