From patchwork Mon Jul 9 15:21:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 941362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EaqkgJrx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41PTb75MH4z9s1B for ; Tue, 10 Jul 2018 01:22:11 +1000 (AEST) Received: from localhost ([::1]:42734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcXzN-0000p0-Bz for incoming@patchwork.ozlabs.org; Mon, 09 Jul 2018 11:22:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcXyf-0000mb-Kk for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcXye-0005WG-OU for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:25 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcXye-0005Va-Ij for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:24 -0400 Received: by mail-wr1-x42b.google.com with SMTP id c13-v6so11370600wrt.1 for ; Mon, 09 Jul 2018 08:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=emf9SSVeraO6trKb5MUg4R4/JCmRNeG1mF3NKe/lntc=; b=EaqkgJrx9J9ESXztOR2Xd/M/czyipO9gWvksMmt2MpNtXnzz9YFm63r7lk/Xs1FkKz DA9ufYAcMm8NOGz2szn9rr6a2XrDqSQjF9C44WrZZbEoUO3dtWwg+BQlqF8fY9f4sDpn bUnOECl1LYUGpcd2kSUR/dRHoJ4S1P3kDb5yI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=emf9SSVeraO6trKb5MUg4R4/JCmRNeG1mF3NKe/lntc=; b=O37nGx4046f/C36u8zb6VVmKpFwDYhr2J5b4ZjXMWt3HmsF6gkNGAUKq8Zq3Se4ASs hIYQPo2rCqwU0JNxD6JS9C/hA/ifenhy/1cu8C/7YPwaZ9VIMiPqiKZDE1mLsPoO2WMb 0Cb/L+ejrjy8e/p//0vgq/Ipp59Ici8WuYuOJ5gFTG2xrnDFV1mbcr+u/5RSNU95dG4R f7jP7Dy53i8sQjBNMD48k0DEpjLRwyvOdCGo0pqGImI2vZ+/78FtdEgfFJc4cBMBN3BT onV77reVZCT/4SsCCaF1sZzy2Jr3e8T75c77Q02ukdLWYaJsg//SvmOjRn80PaRqOBz3 /y0Q== X-Gm-Message-State: APt69E1FCYqrGLK9AXxyWowqtZ2/xVURV3LfEhY5+yZiNQkUbLnuZotl vmDOFTU3iGHegF4YvXTT/uzktKqnTv0= X-Google-Smtp-Source: AAOMgpfYuv/RaDm2uszyd1J76310cNYLsbKC1esMZiLwP1CmXWjJacOAjjlOgkbQhAm3Blc5SozinA== X-Received: by 2002:adf:c4a7:: with SMTP id m36-v6mr14871180wrf.103.1531149683561; Mon, 09 Jul 2018 08:21:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 5-v6sm33092816wmv.48.2018.07.09.08.21.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jul 2018 08:21:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4B0713E0775; Mon, 9 Jul 2018 16:21:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 9 Jul 2018 16:21:12 +0100 Message-Id: <20180709152117.21585-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180709152117.21585-1-alex.bennee@linaro.org> References: <20180709152117.21585-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PATCH for 3.0 05/10] docker: move make check into check_qemu helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Not all docker images can run the check step. Let's everything into a common helper so we don't need to replicate checks in the future. Signed-off-by: Alex Bennée --- 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="check" + else + TEST="$@" + fi + make $MAKEFLAGS $TEST +} + 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