summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2020-03-10 16:03:42 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2020-03-10 16:03:42 +0000
commitae96a47cc5f74ac7c035f92a801e6f7132293967 (patch)
treeabc2282e8b90ad622e46914fa4940c98113933ea
parentb08e3cbc8c8aea1a52a998cdbbc84e53d32e310c (diff)
parentbd2ff3a23bd293527087c4a12e22c839712df022 (diff)
downloadcogl-ae96a47cc5f74ac7c035f92a801e6f7132293967.tar.gz
Merge branch 'wip/smcv/tests-verbose' into 'cogl-1.22'
[1.22] tests: Show the actual output from tests if VERBOSE is set See merge request GNOME/cogl!14
-rwxr-xr-xtests/run-tests.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 763e173b..3c02eb44 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -o pipefail
+
if test -z "$G_DEBUG"; then
G_DEBUG=fatal-warnings
else
@@ -64,7 +66,12 @@ get_status()
run_test()
{
- $($TEST_BINARY $1 &> "$LOG")
+ if [ -n "${VERBOSE-}" ]; then
+ echo "running $TEST_BINARY $1:"
+ $TEST_BINARY $1 2>&1 | tee "$LOG"
+ else
+ $($TEST_BINARY $1 &> "$LOG")
+ fi
TMP=$?
var_name=$2_result
eval $var_name=$TMP