From patchwork Tue Jul 17 19:55:41 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: 142208 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4073923ljj; Tue, 17 Jul 2018 13:02:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdhSAXfYXAGKVoPWVwVYpgEOC3YhgHBTV1h31dDGeJOr/7pVHrph7juvd4cc2CLV0jSCC6K X-Received: by 2002:aed:21f3:: with SMTP id m48-v6mr3170520qtc.121.1531857722968; Tue, 17 Jul 2018 13:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857722; cv=none; d=google.com; s=arc-20160816; b=s76UiV9sgzK69EDA86mSJ8Cm6hfNOeAORPrpjH9st+Xz2+BODNkdYZfg3JZjlsAabx ikeEQbHeajkik1d03FqLf+0DjxYFOd65MVPF4CI42ZRk7Nug+f5cgqkB+0EqOmo+otyV 5A+fu4rR3WPAd3MiVMdOpK8GZwbZWQm50ml15bxyeSsLDPlFmbHsmpUGa1sN5OJ6POTc 2P9gClmytHj1M6nUFxfDrqd7tdlL66Z2jaDC4N1B/ztdJKX5dpzXM/ZpNPKxqOLr6qgU EnU+Ft028Q8pGONhHw1E/qYbGQxMF74nLo5YrpdxneCmseM4/f3XdejZoZXR69WsTfrV oP5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=ERLXJ8EDRCZNpbYNqZTOP01060iVj12cBH0Ejozgd/BaWPPKFP6aGx3d2Ga6gd7HWH Zal4pExgR3DmrGJGUa8nCbj9L+x2vIYu0pF1KpOzfKkB3s10slfpAA5hSgPp5mykOWvE DwVgENCMhTT+wUmXl2cSdMSbodCxH69KIIN17gtI/p9m1LPLCea43J4Z8TKjJvXS4AJV xBdREsQr9bY9W9OKRKOAxW1eF9QIClyM/MQxLabbqN3fQaeelFqYZGZKOaysyqag+Xes 6qcOJb/NkYofH4hmls2fP7Lqtgz+cVTeP9aALxR/1bCD2dk41cYuT8nBHdd2uix3c56N aLsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBBC0jlW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l31-v6si2135427qva.232.2018.07.17.13.02.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBBC0jlW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWAb-0007DP-FA for patch@linaro.org; Tue, 17 Jul 2018 16:02:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4o-00031b-7R for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4n-0004cB-5z for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:02 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4m-0004be-Vc for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:01 -0400 Received: by mail-wr1-x441.google.com with SMTP id c13-v6so2397730wrt.1 for ; Tue, 17 Jul 2018 12:56:00 -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=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=DBBC0jlWeL18f/XWW4o5aefeFyj1F/HMrSAhGjN70A/rvqxCj2HDRJKDzVDORIWtN2 cbbnOkrUH/0CTy4oGozYU8gP9zze8tR2CJiAhJ7eWHpV/bmQD2x9nORikhKZAnYSMCr0 jVYjTkuOPm5npW5NHJZB2EYeSFyCApzJ/ZBdk= 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=dt/YUGiSj2sXUyflEazdFlMWV5/qKTm0TfhMHFSwwIY=; b=qJUKZac7vb7Z0d3pATzhIezSa4ryMHxO1TMN71Wgd5KTKGLltuf4beD88qAwoxZFWn O4MA7Dykv5e8M5eAEvmVQ+i8G7Az10FK32JdHZJpNc/BTx7HuOdXmHF2erk3QGpWIlbA Kp5blWqwe8Bkg+BMT9UEceaaIPfNuHvPVW3Rs1oh6AzdXabEvELJKxxOLDrpmYvHnlVW pN7Z1AY5buC5gr4thyiaZggVlvI+hq3fnI3JxXBvMwsXRVsq68FeI+ZNmyEl96dcnl5O APZCvSWpPjXE8KyrRMOgdMb0TaPtQIKgG4lmf6YIDTq+BQxQkhVkA7T/K1Pa0KKf6Wld 45lQ== X-Gm-Message-State: AOUpUlGndTGoCYvaWTUc4CkO/wz5wjwF4ZrCeuMM0VhF12pO4N9UrPFh 35iQ/qmVPcF/rq5upbD4dXW/ww== X-Received: by 2002:adf:96b2:: with SMTP id u47-v6mr2374531wrb.204.1531857359784; Tue, 17 Jul 2018 12:55:59 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm3247799wrr.10.2018.07.17.12.55.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:55:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 56FC83E060C; Tue, 17 Jul 2018 20:55:54 +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: Tue, 17 Jul 2018 20:55:41 +0100 Message-Id: <20180717195553.9111-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-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::441 Subject: [Qemu-devel] [PATCH v3 for 3.0 06/18] 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - add "move" to Let's everything in commit message v3 - avoid confusion using IVOCATION, add comment --- tests/docker/common.rc | 11 +++++++++++ tests/docker/test-clang | 2 +- tests/docker/test-debug | 2 +- tests/docker/test-full | 2 +- tests/docker/test-quick | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) -- 2.17.1 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