[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/17] docker: move make check into check_qemu helper
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 06/17] docker: move make check into check_qemu helper |
Date: |
Tue, 24 Jul 2018 11:50:58 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index ba1f942328..4ff5974016 100755
--- 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 e90a793178..324e341cea 100755
--- 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 d3f9f70d01..137f4f2ddc 100755
--- 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 b4e42d25d7..aadc0f00a2 100755
--- 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 3b7bce6105..eee59c55fb 100755
--- 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
--
2.17.1
- [Qemu-devel] [PULL for 3.0 00/17] docker fixes and tcg test tweak, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 01/17] tests/.gitignore: don't ignore docker tests, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 03/17] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 04/17] docker: fail more gracefully on docker.py check, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 05/17] docker: split configure_qemu from build_qemu, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 06/17] docker: move make check into check_qemu helper,
Alex Bennée <=
- [Qemu-devel] [PULL 02/17] docker: base debian-tricore on qemu:debian9, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 07/17] docker: gracefully skip check_qemu, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 11/17] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 08/17] docker: Makefile.include don't include partial images, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 12/17] docker: report hint when docker.py check fails, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 10/17] docker: add expansion for docker-test-FOO to Makefile.include, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 09/17] docker: add test-unit runner, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 15/17] docker: ignore distro versioning of debootstrap, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 13/17] docker: Update debootstrap script after Debian migration from Alioth to Salsa, Alex Bennée, 2018/07/24
- [Qemu-devel] [PULL 14/17] docker: add commentary to debian-bootstrap.docker, Alex Bennée, 2018/07/24