diff options
| author | Alex Bennée | 2018-07-09 15:27:47 +0200 |
|---|---|---|
| committer | Alex Bennée | 2018-07-24 12:45:25 +0200 |
| commit | 56c115a953a17975ce277b719448e02053906124 (patch) | |
| tree | 6d06c3d10a582c4f9b68d50a3a981a20b2399e88 /tests/docker | |
| parent | docker: move make check into check_qemu helper (diff) | |
| download | qemu-56c115a953a17975ce277b719448e02053906124.tar.gz qemu-56c115a953a17975ce277b719448e02053906124.tar.xz qemu-56c115a953a17975ce277b719448e02053906124.zip | |
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>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/common.rc | 8 |
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() |