From patchwork Fri Jul 13 12:17:31 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: 141878 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp742011ljj; Fri, 13 Jul 2018 05:29:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf+LL/hzq78OTvBXnUi/MShkX1/Q/PfpvtG9f0gkIFwypapmlPkf516t6zPnPs3ldzDDieY X-Received: by 2002:ac8:8af:: with SMTP id v44-v6mr5760536qth.33.1531484961275; Fri, 13 Jul 2018 05:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531484961; cv=none; d=google.com; s=arc-20160816; b=Zn1mLwJITQJzNb6GKbhmKx4X1oNr/KjKKBmER8bM6o+cTAdwWGf1I9MEcPlvxpUVdM 74Puye8ZI8Ve5Su0sri3dN4H3UqyoxS+ozFQxtH3SzY09Stodf759S32DCVlK7AAvLSw W1YlC8BTfMx1TinOfXyrx++7qaPtlNd+ulLrmgffpCcT9TvQQrgWpyXmWWDQGHlPMxhK F9JavttAxB57q0WrN3NxagFDOeJ58BEtj3e+i85aVIFzwXsTgI29wnGDKb9gNEAkhvTX NjKBIRrOdBwOWCCTdtOiaAbHrT+iOUdHluhTAUFHuASHzAzTkJo6VT7V923IZ4jwNe8A uKkA== 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=geYo+8uA6PiLU4TfomqugeI05sb+kolIYglmvhXVCyY=; b=nidfHmijt5n7kchYnQRQnP9QoklzHWJACKNPW2ShmbF7oYHZTQdeMEl4TjjrQET5FV usB1yITrBU5lLnjwvbMptJWQwfICodDP0ZL4FUzzFw82fEpnuf0bQO971XnLb9lUvVk0 th5gklmtA4q68VtQ6ym3gD8HXGAKTMX5jN+mY4n7sydkTdiyzBqVWcqadEM9G5rxHjk3 eY6UrXLxN1eJ+LPBie9xQb0JGywGzMFpOdKByzn3mBhxDCGAvO0E1uJXFcyeOMNHs6Pn gnzL7Ud0Tgsz5hzTP/jWOKCLE923Xa6LBzcUK5c/MsuuieK7tWf1vHwuZ1JAar65G1vV m+KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GDCvMe1S; 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 f34-v6si8171587qtb.125.2018.07.13.05.29.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 Jul 2018 05:29:21 -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=GDCvMe1S; 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]:37032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxCK-0005ZG-Or for patch@linaro.org; Fri, 13 Jul 2018 08:29:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1C-0004mR-Gi for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1B-0003i3-2r for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:50 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1A-0003g2-R3 for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:49 -0400 Received: by mail-wr1-x443.google.com with SMTP id r16-v6so24914122wrt.11 for ; Fri, 13 Jul 2018 05:17:48 -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=geYo+8uA6PiLU4TfomqugeI05sb+kolIYglmvhXVCyY=; b=GDCvMe1SoyVF9aLwx29Q/fK9zD4e0QdjWYQgmPVVY2n+LMAaj4jMFSkbBfWUywH6X7 Koaj+262dimmwmHBpzF8b1hlLN8Mt9tqLJHCXzoCUoDKjmbZRsFy+7Xuqs97cWsPJ3M7 cuM9ZMGaBb0pRuYNZA2pCEIVDR7fPDgCLXLtc= 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=geYo+8uA6PiLU4TfomqugeI05sb+kolIYglmvhXVCyY=; b=o1xfxrEHNgoiwmkm8yjA7W10Z252tDPIXKKgnd4oQgLn13v/qiZz4hEuXcwU56+Mhi Rnbj0ZE2fyvModWsQRxA4vupFuZ6pMxAiiAIOXA1Y7DGWMPfqWGmzFG8nBKQJ+azH3Fn A7/D4EnyrtcR2R2MMUJYDUoyXldBOhwGE1qTjpZj/iY0o2DEDOfcDA5ynqJopib0e3P/ N5yamUJie0bhrl1BE9dBxRp4B2Iox8tKeOnbn9K6+VnTB9Y6sKXrKO7gW0Tzpi2ZFKJc YJm/cM73q4Ju45Rlntb0VhypWImphXdCKMuqw97kgGrZEQZPZXpvYAt5MAhp7g42KxWf MA4A== X-Gm-Message-State: AOUpUlGgK+N3+qnwYtLT3/TPAQZDtB9ktEFPfoLNkcjBvVqEDedbZ1pA spQqko+f44d/Yx8aFpCa+EptqUBkueE= X-Received: by 2002:adf:a14a:: with SMTP id r10-v6mr4612548wrr.104.1531484267904; Fri, 13 Jul 2018 05:17:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i1-v6sm3696235wrq.69.2018.07.13.05.17.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 67F8B3E0719; Fri, 13 Jul 2018 13:17:42 +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: Fri, 13 Jul 2018 13:17:31 +0100 Message-Id: <20180713121741.19262-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::443 Subject: [Qemu-devel] [PATCH v2 for 3.0 06/16] 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 --- 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(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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