From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffMlx-0000xq-Gi for qemu-devel@nongnu.org; Tue, 17 Jul 2018 05:59:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffMls-0000zx-TR for qemu-devel@nongnu.org; Tue, 17 Jul 2018 05:59:57 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffMls-0000wP-Lq for qemu-devel@nongnu.org; Tue, 17 Jul 2018 05:59:52 -0400 Received: by mail-wr1-x442.google.com with SMTP id c13-v6so633003wrt.1 for ; Tue, 17 Jul 2018 02:59:51 -0700 (PDT) References: <20180713121741.19262-1-alex.bennee@linaro.org> <20180713121741.19262-7-alex.bennee@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: Date: Tue, 17 Jul 2018 10:59:49 +0100 Message-ID: <877elu5giy.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 for 3.0 06/16] docker: move make check into check_qemu helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: cota@braap.org, famz@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, qemu-devel@nongnu.org Philippe Mathieu-Daud=C3=A9 writes: > On 07/13/2018 09:17 AM, Alex Benn=C3=A9e wrote: >> 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=C3=A9e >> >> --- >> v2 >> - add "move" to Let's everything in commit message >> --- >> tests/docker/common.rc | 10 ++++++++++ >> tests/docker/test-clang | 2 +- >> tests/docker/test-debug | 2 +- >> tests/docker/test-full | 2 +- >> tests/docker/test-quick | 2 +- >> 5 files changed, 14 insertions(+), 4 deletions(-) >> >> diff --git a/tests/docker/common.rc b/tests/docker/common.rc >> index ba1f942328..cfc620d554 100755 >> --- a/tests/docker/common.rc >> +++ b/tests/docker/common.rc >> @@ -40,6 +40,16 @@ build_qemu() >> make $MAKEFLAGS >> } >> >> +check_qemu() >> +{ >> + if test -z "$@"; then >> + TEST=3D"check" >> + else >> + TEST=3D"$@" > > This is a bit confuse: > > check_qemu V=3D1 -> TEST=3DV=3D1 > >> + fi >> + make $MAKEFLAGS $TEST > > -> make V=3D1 How about s/TEST/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=3D"--cxx=3Dclang++ --cc=3Dclang --host-cc=3Dclang" >> #OPTS=3D"$OPTS --extra-cflags=3D-fsanitize=3Dundefined \ >> #--extra-cflags=3D-fno-sanitize=3Dfloat-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=3D"--cxx=3Dclang++ --cc=3Dclang --host-cc=3Dclang" >> OPTS=3D"--enable-debug --enable-sanitizers $OPTS" >> >> build_qemu $OPTS >> -make $MAKEFLAGS V=3D1 check >> +check_qemu check V=3D1 > > Gotcha! > >> 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=3D"x86_64-softmmu,aarch64-softmmu" >> TARGET_LIST=3D${TARGET_LIST:-$DEF_TARGET_LIST} \ >> build_qemu >> -make check $MAKEFLAGS >> +check_qemu >> install_qemu >> -- Alex Benn=C3=A9e