aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-07-09 14:27:47 +0100
committerAlex Bennée <alex.bennee@linaro.org>2018-07-24 11:45:25 +0100
commit56c115a953a17975ce277b719448e02053906124 (patch)
tree6d06c3d10a582c4f9b68d50a3a981a20b2399e88
parent3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13 (diff)
docker: gracefully skip check_qemu
Not all our images are able to run the tests. Rather than use features we can just check for the existence and run-ability of gtester. If the image has been setup for binfmt_misc it will be able to run anyway. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-rwxr-xr-xtests/docker/common.rc8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 4ff5974016..4011561587 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -48,7 +48,13 @@ check_qemu()
else
INVOCATION="$@"
fi
- make $MAKEFLAGS $INVOCATION
+
+ if command -v gtester > /dev/null 2>&1 && \
+ gtester --version > /dev/null 2>&1; then
+ make $MAKEFLAGS $INVOCATION
+ else
+ echo "No working gtester, skipping make $INVOCATION"
+ fi
}
test_fail()