summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2018-12-17 13:12:29 -0200
committerSimon McVittie <smcv@debian.org>2020-02-24 11:39:47 +0000
commitd21bbf7ea3c089d8abf8c953f17e54c591ccac5d (patch)
treeb9a0bd5db4214cdb91bf2353713a20af2dea949f
parent9735b9f3952b3253f2c76d02aff94b63e11b60e7 (diff)
tests: Use tmp file to dump test results
When running installed tests, the working directory for Cogl tests is in /usr/libexec/installed-tests, which isn't writable by normal users. To avoid the adding stray hidden files to the current directory, adapt the runner script to fallback to $(mktemp) - which is available on all platform we care about - and avoid adding hidden files everywhere. (Originally commit 05ab8eebe8f37d437fb915a2dafe0c0bb68e3950 in mutter's fork of cogl.) Forwarded: https://gitlab.gnome.org/GNOME/cogl/merge_requests/10 Gbp-Pq: Name tests-Use-tmp-file-to-dump-test-results.patch
-rwxr-xr-xtests/run-tests.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 7e62bf0f..763e173b 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -18,6 +18,8 @@ shift
set +m
+LOG=$(mktemp)
+
trap "" ERR
trap "" SIGABRT
trap "" SIGFPE
@@ -62,17 +64,17 @@ get_status()
run_test()
{
- $($TEST_BINARY $1 &>.log)
+ $($TEST_BINARY $1 &> "$LOG")
TMP=$?
var_name=$2_result
eval $var_name=$TMP
- if grep -q "$MISSING_FEATURE" .log; then
+ if grep -q "$MISSING_FEATURE" "$LOG"; then
if test $TMP -ne 0; then
eval $var_name=500
else
eval $var_name=400
fi
- elif grep -q "$KNOWN_FAILURE" .log; then
+ elif grep -q "$KNOWN_FAILURE" "$LOG"; then
if test $TMP -ne 0; then
eval $var_name=300
else
@@ -154,4 +156,6 @@ do
echo ""
done
+rm "$LOG"
+
exit $EXIT