Commit 3f9747a7 authored by Alex Bennée's avatar Alex Bennée
Browse files

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: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent e4ce964d

tests/docker/common.rc

+11 −0
Original line number Diff line number Diff line
@@ -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 "$@"

tests/docker/test-clang

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/docker/test-debug

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/docker/test-full

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ 


cd "$BUILD_DIR"



build_qemu && make check $MAKEFLAGS && install_qemu
 
build_qemu && check_qemu && install_qemu

tests/docker/test-quick

+1 −1
Original line number Diff line number Diff line
@@ -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