diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2018-07-09 13:27:54 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2018-07-24 11:45:25 +0100 |
| commit | 3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13 (patch) | |
| tree | 60cb3cd074b9d43cafa0e81e3ce39c505d483ba8 /tests/docker | |
| parent | e4ce964d94ee8648c85cbdbe149156d29a4ee53f (diff) | |
| download | qemu-3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13.zip qemu-3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13.tar.gz qemu-3f9747a73891e50d9c09d2fc3dbba6f1fdd03a13.tar.bz2 | |
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>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/common.rc | 11 | ||||
| -rwxr-xr-x | tests/docker/test-clang | 2 | ||||
| -rwxr-xr-x | tests/docker/test-debug | 2 | ||||
| -rwxr-xr-x | tests/docker/test-full | 2 | ||||
| -rwxr-xr-x | tests/docker/test-quick | 2 |
5 files changed, 15 insertions, 4 deletions
diff --git a/tests/docker/common.rc b/tests/docker/common.rc index ba1f942..4ff5974 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 e90a793..324e341 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 d3f9f70..137f4f2 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 b4e42d2..aadc0f0 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 3b7bce6..eee59c5 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 |