docker: move make check into check_qemu helper

Not all docker images can run the check step. Let's move everything
into a common helper so we don't need to replicate checks in the
future.

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>

diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index ba1f942328a89bcd16dcc4f60baf023761bb85fe..4ff5974016a741c41c60c1ceb1db2e62e7fae8d5 100755 (executable)
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -40,6 +40,17 @@ build_qemu()
     make $MAKEFLAGS
 }
 
+check_qemu()
+{
+    # default to make check unless the caller specifies
+    if test -z "$@"; then
+        INVOCATION="check"
+    else
+        INVOCATION="$@"
+    fi
+    make $MAKEFLAGS $INVOCATION
+}
+
 test_fail()
 {
     echo "$@"

diff --git a/tests/docker/test-clang b/tests/docker/test-clang
index e90a793178c069ee12bfec84a7a946f064610c42..324e341cea917ad6cc76880481fd19dc65716bfc 100755 (executable)
--- a/tests/docker/test-clang
+++ b/tests/docker/test-clang
@@ -23,5 +23,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang"
 #OPTS="$OPTS --extra-cflags=-fsanitize=undefined \
     #--extra-cflags=-fno-sanitize=float-divide-by-zero"
 build_qemu $OPTS
-make $MAKEFLAGS check
+check_qemu
 install_qemu

diff --git a/tests/docker/test-debug b/tests/docker/test-debug
index d3f9f70d01f2571e381b741b0a82e04e8e03cd1f..137f4f2ddc10c5bd43870d8eb700b2dc4bade746 100755 (executable)
--- a/tests/docker/test-debug
+++ b/tests/docker/test-debug
@@ -22,5 +22,5 @@ OPTS="--cxx=clang++ --cc=clang --host-cc=clang"
 OPTS="--enable-debug --enable-sanitizers $OPTS"
 
 build_qemu $OPTS
-make $MAKEFLAGS V=1 check
+check_qemu check V=1
 install_qemu

diff --git a/tests/docker/test-full b/tests/docker/test-full
index b4e42d25d7a53a93169e0811267661cd1eaffc50..aadc0f00a2acecdd0c9eae1a962d46f97ae7d219 100755 (executable)
--- a/tests/docker/test-full
+++ b/tests/docker/test-full
@@ -15,4 +15,4 @@
 
 cd "$BUILD_DIR"
 
-build_qemu && make check $MAKEFLAGS && install_qemu
+build_qemu && check_qemu && install_qemu

diff --git a/tests/docker/test-quick b/tests/docker/test-quick
index 3b7bce6105da7b8544c4dfdbe5851e695144e6fb..eee59c55fba0951f761444e194ff6cd00f11eee9 100755 (executable)
--- a/tests/docker/test-quick
+++ b/tests/docker/test-quick
@@ -18,5 +18,5 @@ cd "$BUILD_DIR"
 DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
 TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
 build_qemu
-make check $MAKEFLAGS
+check_qemu
 install_qemu