]> git.proxmox.com Git - mirror_qemu.git/commitdiff
docker: gracefully skip check_qemu
authorAlex Bennée <alex.bennee@linaro.org>
Mon, 9 Jul 2018 13:27:47 +0000 (14:27 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Tue, 24 Jul 2018 10:45:25 +0000 (11:45 +0100)
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>
tests/docker/common.rc

index 4ff5974016a741c41c60c1ceb1db2e62e7fae8d5..4011561587a5794021187d4792360d17bfb7784c 100755 (executable)
@@ -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()