From patchwork Tue Jul 24 10:50:58 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: 142751 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7114191ljj; Tue, 24 Jul 2018 03:51:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd1IN784lvFYB5SQe47yCKf+RucM1TfVG3MQkCPk1hUDZlQ9Cw5psZnYS8OMu/P82nA4jNX X-Received: by 2002:aed:355b:: with SMTP id b27-v6mr15233309qte.399.1532429508353; Tue, 24 Jul 2018 03:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532429508; cv=none; d=google.com; s=arc-20160816; b=K90CmevsGyKLyWUIxzwM1kjK+3pE15ajp4J8f1O3hkbOF8Z0pUW6aQY7Mezi+Zb+7D kcCEcTNmjuMDDESGRKIlUs4ZWxr3k5UwD7dU8wO3GLxuAzJr9KTRlqg4dpNrjoLnAl++ bs0Xw6w4d6tNZh8ZCN6loJ6wp+fM+PPJE4fnca6jj7gv//uBOBi7pXrMlKFtPE/bDCwp m//VLcye62DMueUIom4kywPUhB6IZKP+2Gzm8yJg9YZy2u64QcuJeNcyI5/NhNzpYKPM ISDhGzhzCXrs4jBzdBtSbCkdkR9FesvBVc4el+i0HIigBZtrXbUXONzqn2VB+DACLQ2R x0Cg== 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=+pe6j9bzOj5I4gXcwzbYdbHIcfj1wXvLg53uu7KEQGE=; b=n4qbjk+gcXjQ46O1zj0iR6SJsJ2HIk43GEwzvgMBRpVMT49SMkaZR4GXix53kvB6kF 3R9VBbhE3doejdmaQQn+VL0VWwXLg1IVQ5hO2amK7qHdcdjYKaxcwbZzQatBGt3/LSaq O2KAWxWhyk+5+pEDndthIgTpPcV7MIHLUj3SJBVQjTCjPjFz7CQ98vxL0T3VWH8MjOdd czSZMVYv1/47tmV08CnR+zxeyiA7OK2S5k+Gqqgo6kRNJJa2B1fUOa2Qr/8IMbfG1BOk 5djMYU0RNi0f9Rr9lxVZpcYPsFyJwfor7prgmhXrUySIIDqQIYuocHEHeLEz9KFu+kFD R+7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fZQaD/wX"; 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 14-v6si10975290qkk.312.2018.07.24.03.51.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jul 2018 03:51:48 -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="fZQaD/wX"; 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]:39444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuux-0000vR-Oy for patch@linaro.org; Tue, 24 Jul 2018 06:51:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuV-0000s7-Gu for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuU-0006RY-62 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:19 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40457) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuT-0006Qx-Ta for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:18 -0400 Received: by mail-wr1-x441.google.com with SMTP id t6-v6so3653925wrn.7 for ; Tue, 24 Jul 2018 03:51:17 -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=+pe6j9bzOj5I4gXcwzbYdbHIcfj1wXvLg53uu7KEQGE=; b=fZQaD/wXtEOvePzWAJMyFqH3qTDmoDensstXUc74wsr+zB+97GQSERtFA1EWSRuz9y Jv3A2LFWZHzw7N8qChLMpyHso0IJ47moGmjqd0utin8DsdD0IUn1eISC6HhFW+cNXFOv +sKbfXmp4biZcK9ZD6pTULxdnOen7VIsdo0B8= 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=+pe6j9bzOj5I4gXcwzbYdbHIcfj1wXvLg53uu7KEQGE=; b=TxzPzZoLVl3rT9GnNVEUszvsAi6hpp/fDSV2lanI+5iPnQMzNsK+Q/mNSdTfXJgdsT 0DypwJWFFNZ/yCeK5B8uk0Lvfx119QybVmbFd5e/+kYNDXsYWTY3IVOLto/8opHsG6rP UAaGHQxTlGcksdR7NV7Kq2nragpVMeZGU9zj5G7vwqvR6QM8+owQGVFE4Fk+DqUtJoK5 ygm+4BmFOxgGpVGlhm5aF1zzQG/ynd1KTlGHCXAOsCJxl3o/7J0yBFg0l2Sjnoy+zp83 9LIUSd6LosSdkS7UtFW3pSzScWka6q3aIZ8qxL+40iT5wFPrWGyVX5Pfqezi3pSlRvC+ bT+w== X-Gm-Message-State: AOUpUlHJ367CoPMLTnTKPCwD7eocgBIaie3EGNchYN17DV81ZFBgweLa R8WSg6ss7i5ZSHOOcVEh9f8PIQ== X-Received: by 2002:adf:dbc3:: with SMTP id e3-v6mr10786666wrj.217.1532429476811; Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12-v6sm1767411wmc.27.2018.07.24.03.51.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5B8503E0641; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:50:58 +0100 Message-Id: <20180724105109.8392-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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] [PULL 06/17] 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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é -- 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