summaryrefslogtreecommitdiff
path: root/tools/test-wrapper.sh
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-10-26 10:59:54 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-10-26 10:59:54 +0100
commit9802fab3c98a52bf5f86f20dce7a93b081cdd05f (patch)
treed0b1a70542747522d01584b3bac91b0956196c63 /tools/test-wrapper.sh
parent31f967079a959007820b522b6c45ba4a4c31d5ee (diff)
downloadtelepathy-glib-9802fab3c98a52bf5f86f20dce7a93b081cdd05f.tar.gz
fd.o #31129: if stdout is not a tty or CHECK_VERBOSE is set, do not delay test output
Diffstat (limited to 'tools/test-wrapper.sh')
-rwxr-xr-xtools/test-wrapper.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/test-wrapper.sh b/tools/test-wrapper.sh
index 56adc3ab0..69c9b52d3 100755
--- a/tools/test-wrapper.sh
+++ b/tools/test-wrapper.sh
@@ -6,9 +6,15 @@
# Usage: test-wrapper.sh PROGRAM [ARGS...]
set -e
+
+if test -t 1 || test "z$CHECK_VERBOSE" != z; then
+ "$@" || e=$?
+ exit $e
+fi
+
e=0
"$@" > capture-$$.log 2>&1 || e=$?
-if test z$e = z0 && test -t 1; then
+if test z$e = z0; then
grep -i skipped capture-$$.log || true
rm -f capture-$$.log
else