From patchwork Mon Jul 2 14:30:02 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: 140778 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp27808ljj; Mon, 2 Jul 2018 07:34:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcI+7ms6kN+79vssYkwc0glwbaj0cgsAZHBrxueTRLQ4hqDB5pfg/QRiWH2L4xI0Q7gDZDG X-Received: by 2002:ac8:1b88:: with SMTP id z8-v6mr23152593qtj.321.1530542055059; Mon, 02 Jul 2018 07:34:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542055; cv=none; d=google.com; s=arc-20160816; b=riNvZQq/cTebabOhZWd/6ABrk9neP7n50g8sNFgPTskkT5RMpA3db92oXds3sQ6PNR D8BCFvNn9C2W/ihqpQummMVsD74oobCyj55/+o+9w4zXnNdyfDU1UBA89p7gcxj6ifoh rrETPCiWsyeSdAdzM/Osz2QGw1AP/aaxDQMRS5c8+Gwxd0JaIAA3gYkJikXoK/dx0mzK LbI5g5J0ZQbbvNH5/QkCE3BxGNKqbHFmLets55RXz8HEDaPFtLss2yfm1JTesnnn3Wjh u3CbC9OB6G+iXY5qIR8i9QjB8qAf39ZVQnX6qM+cSe3O3h2sQ/gUij+tzL45ZWpVl6QX q68g== 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=tpPmTCvTZ2FMs/GCk5dwQQ1eoPiONal16+9lLS7c4ME=; b=Ht46X6uQtWiqLBcuepaLm0WSlgEKRSFTSXqXFSUebYfcaed1L3etfzKDcFPrx0Dme+ ierHB+XIm1Z+qUJX3E6LpH8Vxsi9h7eAeAMGijKH7ih9TRHWz9Jq3s/s9mcpdD8xwuJC IVsaFP5gjl2fS7RkF2VvM3zpgZZdh5sG1J01wqBYtQXgROYtNn2TGu1RC/SDmUvhN5az lIe2tfB48Isrr8/Hg0ziao4xJ6VPxI+TsETVFtcj9jqDAezrn7e6q8W7AhkEHnESfssn Ntb6J8TtSsvH94vuFxU4iL1x2PedKaru3RzYP7EV8B3iIJmIQQacmsBG4obWy2PYH+I1 ZSvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hzxaoHQX; 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 y196-v6si1063829qky.244.2018.07.02.07.34.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:34:15 -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=hzxaoHQX; 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]:33159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzuA-0007qX-F5 for patch@linaro.org; Mon, 02 Jul 2018 10:34:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqV-0005Ly-M8 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqT-0000Qe-6L for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:27 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:39184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqS-0000Q0-Qw for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:25 -0400 Received: by mail-wm0-x232.google.com with SMTP id p11-v6so8928696wmc.4 for ; Mon, 02 Jul 2018 07:30: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=tpPmTCvTZ2FMs/GCk5dwQQ1eoPiONal16+9lLS7c4ME=; b=hzxaoHQXF57mK4oK6QiRokrjFOGknL+TmVWj/F4MpEJnamAxC6CVkM39nf28R9fYPY mVQgkNtJ3gbM3bc9ytrJ+g/3uBNd8xrhFQzbD/o32mq70CYpuQ3S+qmqEQh+Ga/fa8cm uePF2q/jpRFll3gZOWMJNTDBOZqoj6+YM+HeI= 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=tpPmTCvTZ2FMs/GCk5dwQQ1eoPiONal16+9lLS7c4ME=; b=uDb8NExU2oJWtD7yvIkxCycwHFsX0UkHWXYKlI3vO9acnnfxEFqut8vkQlm77TJyiS 5Ta8uxkZe8C4V9emIBnju/QwWt1T+RKGFP6J2XX9D9HVOzxp+H9GqxcmFr2hDlQDVaxi FYRY/gOOI+uJzjqJTpLSrpM9oZ6lTnH68RdR1dxAL1lx2dwlSiiWM0fSMjPijF9i1h+w tHkPoi2TyBihZ7mH+0svaPJrTUNXnI04KIkIUb9mQUssa0i1Kv0VyLZ2owWsweW6THID xvQAACCHXn2ielu8xIkPIDdPfnVfk6Yx/YnbffC4/Q92QRqpbxBdD1IT8GVvjiC5kvlj kUfg== X-Gm-Message-State: APt69E1zaVrKq8TA6mK9KWC3iSBxt55F/PA60ViJdBTmpa8hJt2mk1Vk /xvLoqlLVDz+2yT9Qg4gUJu1dQ== X-Received: by 2002:a1c:8952:: with SMTP id l79-v6mr6076932wmd.7.1530541823754; Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h3-v6sm14734309wrm.8.2018.07.02.07.30.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C25583E0625; Mon, 2 Jul 2018 15:30:21 +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, 2 Jul 2018 15:30:02 +0100 Message-Id: <20180702143021.18864-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::232 Subject: [Qemu-devel] [PATCH v3 01/20] travis: do not waste time cloning unused submodules 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Builds only require: - dtc - keycodemapdb - capstone Signed-off-by: Philippe Mathieu-Daudé [AJB: drop wget cache] Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index bd66c18fed..134d5331fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,8 +66,7 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive + - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - ./configure ${CONFIG} || { cat config.log && exit 1; } script: From patchwork Mon Jul 2 14:30:03 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: 140774 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp23975ljj; Mon, 2 Jul 2018 07:30:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc0naQ9CA4Cu4nPl+xzEZNVoe4TpKS4YJqY4DwLWNxu6Ss+dOYx0WjgMo+QaOqQtY5Baxwj X-Received: by 2002:ac8:29ef:: with SMTP id 44-v6mr7463461qtt.174.1530541858670; Mon, 02 Jul 2018 07:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530541858; cv=none; d=google.com; s=arc-20160816; b=zCjlDIU5koN9+BLQmMEWbPTbJ30sr7Hf743MJsBZl1Wf7mUeZpVtZDrpanCgWFC0Ni ZnUTbccLdsP++xu0mNTHTJzFwCBs3TL7mDyz2KZpvW9Rlf3bWELpTv+wNuGRIGTWsU6v 0+A9Rb6HT7qc4Uiv1pRN8HHKnViSzS4h/Pjmhs8YFXUOiwR927DZnMRrOBbyd+ZCUA46 d3chn8nLc4otz9KDyVZCu7E5kEDM2B/L39yCBybD9/eNbgT2KPWHU431vlsdH4+SahOe vxbo2HmzcYJA5j/XZkoYlfWDuprHgsMKnZLy2gaqvRxIyvRR7Z6eKUkfD7Wzs9vn8g3Z aMAw== 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=aLRRfTifj+vCQZLLSS1uMRWJE+rR0Fr5BOQLcDcjU5Q=; b=HCYPqc9qTfMLJANjPkyrsNYkXKB+zMi4oi0a/aHf6CtiDdVkOF+cOAAzURZxwdgdmP JQtAa8GxujMw0OP3jbf9oOQoIbjG+eT/lkVdZI6ultq0g/66m3TRFpYPWdcKIp3iaJcx 7GfsBb/nMnCXxP1imC3fVdk1VpA8JBKskO7e0rcOuMO358C3EyqsDtGHp3oCyBHILeUU PpdIhlksAXe/cbTD9hYBm30Xz3MUK92HRB2nGTIkjdyG7d5BOdjd7Q8cSizV/nQKd3gc YwR2FOvvxbcGJ4QdeizYGCMGY3MLEVUh/XphzmmoDpUcsC5MSDY77CUSZL3f2qYKO9ux i7IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Dl9up789; 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 i6-v6si3624287qvf.88.2018.07.02.07.30.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:30:58 -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=Dl9up789; 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]:33143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqz-0005MR-TU for patch@linaro.org; Mon, 02 Jul 2018 10:30:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqV-0005Lx-Lu for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqU-0000RA-Df for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:27 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:35552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqU-0000Qn-6u for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:26 -0400 Received: by mail-wr0-x236.google.com with SMTP id h40-v6so4684454wrh.2 for ; Mon, 02 Jul 2018 07:30:26 -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=aLRRfTifj+vCQZLLSS1uMRWJE+rR0Fr5BOQLcDcjU5Q=; b=Dl9up789IoGzBKrN4dss0U92susMhWs6uCGS8xpYudGQP6VBFwxaa+C/0Z3V8GcVZc LIDp4G4HK4WDLBJ0ieQFPK87zTXTN1Zdlu4qdrQIq/DAVRY4f5A80ieKowl5s8LotHmk rRcTnJv1aIRmjOBp5N+VKhf8mj3JtKxzvW3RA= 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=aLRRfTifj+vCQZLLSS1uMRWJE+rR0Fr5BOQLcDcjU5Q=; b=jC387tPPnr5095uX9RmbAX3rn9gREOKXpwMVr3IJB+uOMbz3OamumQTvtEg5Qsac0R 4L9x2yLfDsWaDdwWERhTk8t110Uy1Tna+Vkbwut/ayrUp0Zv3zdvJOMcQzFjiV7O72Ri IHDM0k6wQ5W//W9KPI4ZLhdCXXQgNwertY/xKt6yRdIIpY7QDdaqQKDOlKyed7ERm36F F29AKeg7CBE+/xXpCyzQdvd7bZlId89w61wCV/qtyrdngFAyKusrJqczfCaS4oyN+XGQ pLWVaglF7pJiOMmgALAK4ILXOWNmtMt1J0jBnXve/EuVGkMLAd6A2k9LNKMb7XIRTWmE KflA== X-Gm-Message-State: APt69E38tbY931BdGtd1HZ8byOyFr8NNHWY6Vx3Rjm8/n9gSNbWTUGhy 7jG80q+46vjsjZQk9A415s2iqQ== X-Received: by 2002:adf:b112:: with SMTP id l18-v6mr1900673wra.101.1530541824939; Mon, 02 Jul 2018 07:30:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f2-v6sm18458799wre.16.2018.07.02.07.30.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D6A833E0684; Mon, 2 Jul 2018 15:30:21 +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, 2 Jul 2018 15:30:03 +0100 Message-Id: <20180702143021.18864-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::236 Subject: [Qemu-devel] [PATCH v3 02/20] travis: test out-of-tree builds 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Force one config to build 'out-of-tree' (object files and executables are created in a tree outside the project source code). Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 134d5331fe..32188d51f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,8 @@ notifications: on_failure: always env: global: + - SRC_DIR="." + - BUILD_DIR="." - TEST_CMD="make check" - MAKEFLAGS="-j3" matrix: @@ -68,11 +70,15 @@ before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - - ./configure ${CONFIG} || { cat config.log && exit 1; } + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: + # Test out-of-tree builds + - env: CONFIG="--enable-debug --enable-debug-tcg" + BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG="--disable-system" compiler: clang From patchwork Mon Jul 2 14:30:04 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: 140775 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp23991ljj; Mon, 2 Jul 2018 07:30:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeU+AcztkGbwn+DCLcRDZecVFp/hRTp/Cs7vbjzCrQIsPxlyFLYX+fVpYy4zRoFGLb83obq X-Received: by 2002:a37:a0b:: with SMTP id 11-v6mr17841299qkk.90.1530541859685; Mon, 02 Jul 2018 07:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530541859; cv=none; d=google.com; s=arc-20160816; b=CK/baXPPCwWYFltUTxjndrfNbiFIoaye6VDU8Wm6wf6NZpudcBind8LsIgNztwRa1R kax8seRM4ohIY5DkH30NOZReAzcNsZJGiZ5Zouk9792+vefbDbxiM/BOrKjDAYfBiryp 3Uq+riwAmK6cYOkct0H0zoRdXy10lZkhZHUtIP75dUzuq9WPtD5Hbb1yqc9WEERZvAtV 5TLuWIV1IxDSDGdSWpo553iVh62+ytfSTXYs8bvPvI6EvWJiw5K8HP8P+hGnHOu5hvTf hHYozBAin1Jmj8ZpgDp+G9M11QUa2n2R3FyQw1xplKhyxNpkG/nmPxtyASlzhhEkE+Oi pd3Q== 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=5YJQD6mVsHQ+y4JfkIGsYKr2KX19OUMuNv1hJuaEJwQ=; b=1Dt8BSq5jPermp7FKsZ4B3NGFAmIbB1pL5jFOqvcJBzL+D2llfO/mfXnDRpbNRZic2 Kpih2B69vgXpz2ASa4l9+X1dm1JmbrPTXO1EhmqR1QsXM+7hNSZoHciXmwKsNiValigL 2Rym0vQYrnM37t+BdycZYudGVX4MauF8yLFgV1SKk9gosRll/4zYnybAa91H6I3GaC5V Extoj56lOQwFYMOJYBVZQT8IyfDpT7EuVsVd9zTnCQdUMBgRVHPx72yPsUP3i0ZUTnLU tgkDEUbfAp7EiQuAMFh34Sqbe9UVQA6KE303pkpU6n4UI+E2v0ZlZmlA9vqHklp3zaMX czYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Rx6vbZb7; 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 v1-v6si398071qtf.152.2018.07.02.07.30.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:30:59 -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=Rx6vbZb7; 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]:33145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzr1-0005NA-3J for patch@linaro.org; Mon, 02 Jul 2018 10:30:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqW-0005M0-AM for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqV-0000RZ-7B for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:28 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:33806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqU-0000R1-SH for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:27 -0400 Received: by mail-wr0-x230.google.com with SMTP id a12-v6so15791266wro.1 for ; Mon, 02 Jul 2018 07:30:26 -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=5YJQD6mVsHQ+y4JfkIGsYKr2KX19OUMuNv1hJuaEJwQ=; b=Rx6vbZb7lmWm25d+Ips4mPMEpipLATKjvnSu9lSi6zBXIMerOGanczk5LrEMRLGWZ8 7oXwxjCQsE6+tciSC9SSfuTfyzQDqd4WBCsZdDQ77czPBr3fI4lChz0XIW3swRzmTU7e dy/F3OqsKUkeifxLp9wmxy93pW/CKAAWklLB0= 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=5YJQD6mVsHQ+y4JfkIGsYKr2KX19OUMuNv1hJuaEJwQ=; b=W5/A/tDG00u5nfUckRZG0cR4fWL2cHP1OBvXOuatlpDJ+rJRvQAtHDmcNa5pDnyIxb A6hxS9j13hoNv+QUp4SvOQ1aQVlUQ93R6VguPqRXcoDX9e/WdKg8FlrAd6PGcZmoq448 tPXrxO5iG/ReTy8PUnvnjMEEmEpemlJSPvh4yQlkJu3HjlUcNYCjwGg/VyTI7BOGgd/V mfe77Re1S1b9fHo9ELsxUUS5KKExuVy7QJ9X5u9SbjLif+JNNaplQbP0MTQ08T46GOfN 3JhZYr+3uBBjdo/2hEVkz7xQsvba1uzyY5cbXX3BfkNAeL9uwt3g947FzOodn85njPUs ydqw== X-Gm-Message-State: APt69E3rs2PvFqgr8C1sSqpqGsrrDIjvd2AWxKUqTisnk9bbvou8Bwva banMXbaYov+HKzsEBCPsN56WqQ== X-Received: by 2002:adf:8162:: with SMTP id 89-v6mr12459648wrm.192.1530541825731; Mon, 02 Jul 2018 07:30:25 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b190-v6sm10545942wma.24.2018.07.02.07.30.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EAAC23E06DE; Mon, 2 Jul 2018 15:30:21 +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, 2 Jul 2018 15:30:04 +0100 Message-Id: <20180702143021.18864-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::230 Subject: [Qemu-devel] [PATCH v3 03/20] build-system: remove per-test GCOV reporting 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I'm not entirely sure who's using this information and certainly in a CI environment it just washes over as additional noise. Later patches will provide new reporting options so a user who wants to analyse individual tests will be able to use that to get the information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- docs/devel/testing.rst | 11 +++++------ tests/Makefile.include | 10 ---------- 2 files changed, 5 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index f33e5a8423..66ef219f69 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -158,12 +158,11 @@ rarely used. See "QEMU iotests" section below for more information. GCC gcov support ---------------- -``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the -tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. -Then run ``make check`` as usual. There will be additional ``gcov`` output as -the testing goes on, showing the test coverage percentage numbers per analyzed -source file. More detailed reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the ``gcov`` +``gcov`` is a GCC tool to analyze the testing coverage by +instrumenting the tested code. To use it, configure QEMU with +``--enable-gcov`` option and build. Then run ``make check`` as usual. +Reports can be obtained by running ``gcov`` command on the output +files under ``$build_dir/tests/``, please read the ``gcov`` documentation for more information. QEMU iotests diff --git a/tests/Makefile.include b/tests/Makefile.include index e8bb2d8f66..756474814a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -891,26 +891,16 @@ GCOV_OPTIONS = -n $(if $(V),-f,) .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-softmmu $(check-qtest-y) - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF) \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER","$@") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) .PHONY: $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)) $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)): check-%: % - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command, \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER","$*") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) # gtester tests with XML output From patchwork Mon Jul 2 14:30:05 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: 140780 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp30156ljj; Mon, 2 Jul 2018 07:36:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfxsRTQDw8MUq1s15EMvfJqvATNbHDj0frqU8JK6rDwTIvPU3SpRIr1+aRvCOAb5+WFxHc6 X-Received: by 2002:ac8:376a:: with SMTP id p39-v6mr13279952qtb.257.1530542193584; Mon, 02 Jul 2018 07:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542193; cv=none; d=google.com; s=arc-20160816; b=r4zWOyzvx7uR09T/ih2mJN1R4m+0fdP7FUSnphgvWrT/QlxK32LeH45yuFzWFsdizF 9CctW2yugQpjgu11DT+zmNa44Dieq/Tq9vEKnId4pjDa3nwD/9Gr875mHjZipZvRPId+ j6mnMsLqwYu6yE1eolLd+IL2mNsN9mqUwvy/JAgUaDvHRDLkeqaKBVV28TqT7twPhPoT Uc3milhEd94SmnCnC0KfUQrPOFZyoK9nP/yeGFT7JorJrtwjCbpsHULBks5Tv7kbFcn2 2nRPsQGvtejWkmcq6FmEyrjL13J9wqMsCnvawAD89ljwZFk7IM5q/v6tMoOIX27/yprK As4A== 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=hSfD8ZeuEyMUBqUN8PLWD+iX5qMcNHgixde6yt6aUKU=; b=z0cHWufV14HwpnvA+d1tqetOHsxJG8gCqi3TbalOhu3s1tvXhqHfSQGgGa9Ga1fY7p DN6JuOsm0V6DYO1qIZT0GDlX182FFL3hbaWZFjk2+dnD2p0k8f7clhvAp01qMqGofHGn yNrAP2IcStdRcAGtCaHMJ6CFAsNDUgOva5VsKjRM+WipJsYuMLBRcYkEbT4MYjMf1Alq YqQLsur8qeoNeDvSnbJ/MLgord8lHCIU72p0wQnkrehcAG1HC1S4q/aVYEY6vxLhqUQ6 x0SvCB5SWHd9Xswmr73o84Bo7LBumXs032iJnFoBIKwgGxIPrJyD3Wvy2/li/eib2JP1 X0Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=d0vBaOIO; 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 d14-v6si1692662qvl.16.2018.07.02.07.36.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:36:33 -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=d0vBaOIO; 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]:33163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzwP-0000W8-1K for patch@linaro.org; Mon, 02 Jul 2018 10:36:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqX-0005MD-50 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqW-0000SE-6O for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:29 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:53987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqV-0000RS-PG for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:28 -0400 Received: by mail-wm0-x236.google.com with SMTP id b188-v6so9325048wme.3 for ; Mon, 02 Jul 2018 07:30:27 -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=hSfD8ZeuEyMUBqUN8PLWD+iX5qMcNHgixde6yt6aUKU=; b=d0vBaOIOH6dRfmsQ21UWFd0gNwJj02oemLTw6a68vGHbMrL2hzyTHKYmyjVAyMWR6I zEqU8zt8OKnx47qkLIac/cXXDFK7mbsxr3zq4uPQn9wfiVSK9uHUA4Rsx7kOXCesOsyH moaBt6FMczOvcvmFRuCrfjpOt7KkG6IFqBFuk= 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=hSfD8ZeuEyMUBqUN8PLWD+iX5qMcNHgixde6yt6aUKU=; b=FC90cyHMklcwWhXNFBW7Y9bCkizs0zfmGfrKV4UFse6ThSyCWt7kfR1rDz4LHsw3z+ T/FNERxxThFu8QOA7SbDcxZoX9yDHFPFGJL0aCvM/4wCaV62ABggNFRenk5bJU7XP7fx bIKEz9IqiWHM9L+MX2JEkFMOJnCLqGdFYSCIlUhtj05IxtgV98MgAPS4OoP5JnNOkTfK G5rQY4ey+KB9gdWTAHPRQwoQS0BYgLCjMyVfN3F2sZEdHVBUgmbX5yqaewLc92KfWdlX 6YdQjVqJrA8YlUOGnr7FV/sUXjJmssPOA5BkvhOJnbUuncX0PL+AxN0JiCh51jkFFcyW g7iA== X-Gm-Message-State: APt69E0AtLDEbOKPNwkXPyAQpSxSRPtM/QF04U+pWg8705NpBcGgpVUU cxZRRhfXNtiRIEi5+76+Y+9IBQ== X-Received: by 2002:a1c:108b:: with SMTP id 133-v6mr9251846wmq.136.1530541826660; Mon, 02 Jul 2018 07:30:26 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 74-v6sm663862wmt.0.2018.07.02.07.30.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0A3CA3E0719; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:05 +0100 Message-Id: <20180702143021.18864-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::236 Subject: [Qemu-devel] [PATCH v3 04/20] .gitignore: add .gcov files 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are temporary files generated on gcov runs and shouldn't be included in the source tree. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- .gitignore | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/.gitignore b/.gitignore index 9da3b3e626..5668d02782 100644 --- a/.gitignore +++ b/.gitignore @@ -155,6 +155,7 @@ .sdk *.gcda *.gcno +*.gcov /pc-bios/bios-pq/status /pc-bios/vgabios-pq/status /pc-bios/optionrom/linuxboot.asm From patchwork Mon Jul 2 14:30:06 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: 140784 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp32542ljj; Mon, 2 Jul 2018 07:38:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc35oHyLrwvk8blm+/3NpE/ZRYWhv+n9XC8YZ1d2qdZMZnu18AKLat7f7YYHL1g9Pq/7U4N X-Received: by 2002:a0c:ada8:: with SMTP id w37-v6mr470222qvc.107.1530542336536; Mon, 02 Jul 2018 07:38:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542336; cv=none; d=google.com; s=arc-20160816; b=dNIUVhWH8xsgdYqteguCY12ktasjhfhy7DzRja3/ZP63EstrV4Yher77M9f/C5wTkk eT4lHOH1mWdbV0SKOpGA+ZLO9WanZOpQpM9i01TQzl7IaeiobVgEakG+t/5som+q/7M4 2dNXwHkteaY4nwdJ0rAROlM57QcB3grrOwv9oMZ2K5lTKA6ZwvYvGs3dD6Qj/Jj+0PM8 sfs8TmjOpQvd7y6ZjCnWjB0xFdlcESpPfisCPxjqV032yGDqqsJFX+Ka/xqEe97WxH6c +7nDRz3QpBHw3t3s150N14UUFSS68Fn4g7Bd8/7lGXKN8avI6dgAttu+LPl7sbgYg/QN 7q2Q== 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=OX3O6RbyKSxf/5M1wk0cmWBaoU1nRWslNXg7yPujeKc=; b=o3cYCMRY45isdeLi26akx8sgXC4nlP+J0SuDBM29qmWkcZXianJ3xm45KwslhfYwBt 7YLIenZJprsaYdSnFtZC0F/NoJaja6AHCYc3fyyyeEo8U26Bz04DHLXPoboEDAkAf2ut 5GpjMJlbBExNiZWRphShyCjgRgjnPwpG+2aa1EEn/53m2U6fE+FuANlJr1vAqX9s5hcM mcuLePFzvkCUugDVjd74Rxyc2NhqkohVDrU4tmnrnRGp/oZrPWeIXbxiJXHyGx87jHeF UQYhE9ahEuMdumI55vckXd4psHHgdqoRA+QEUDsTvie4g9c04urHcBpvPlf7SQlJF4f2 mFcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gHNOhgjX; 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 l26-v6si2054108qkk.73.2018.07.02.07.38.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:38:56 -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=gHNOhgjX; 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]:33181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzyi-0002oY-1j for patch@linaro.org; Mon, 02 Jul 2018 10:38:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqX-0005ML-N2 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqW-0000Sj-R6 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:29 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:39181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqW-0000S6-Ku for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:28 -0400 Received: by mail-wm0-x22e.google.com with SMTP id p11-v6so8928968wmc.4 for ; Mon, 02 Jul 2018 07:30:28 -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=OX3O6RbyKSxf/5M1wk0cmWBaoU1nRWslNXg7yPujeKc=; b=gHNOhgjXvx5AUb94jAPg9RnzF3MZRV84KqQAu9duQR/RiAY7nQ6kzFkHlLzWZhl8Ui 8p42Sji8PPOeqfCKa1ZKPmZjSHDBoh0WOWgYw8qAm+AExGRmHERtrUqqOix6ayv2LA8p evopGv1+qNjaPRjW8NovzeBskLRBMzMtQ9wP8= 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=OX3O6RbyKSxf/5M1wk0cmWBaoU1nRWslNXg7yPujeKc=; b=J/ZBpZZuJTI4egn1EQZ787AKtFUoVBCC59B6+spWxaVQW8YaKi3EwAC64xWfuz2DFu dHfIyLLyA1aHIOuzUMGTVeHusorAEet4/RjrSergx50wDbwqT9VbRkRTdBN/3R+b8J0L ArIAYxOnzjxZDH0j5B5JE1GPG2RHApE6MyXawvMaRkjZi+s1hv6uiPaVovPVpU9QReEm 5wtFtQ+fxWDvVEquHHGiVd6sYi929WRFFM5m1juMhUZgrEmaMyi+HzpEOJMOzcSFfK8g 8NY/KLxwqYyyishzQhKcARgEZpYmcZF9Z0U3qo1/xmJ/5kUFGdA5ucco8UPLRyWQ7kl+ TJ2w== X-Gm-Message-State: APt69E2knw+etPu+MPhoAeND9CxWNwH2c2LA9KAzDLxTyOlFwoWp6ao9 mQ+6hPk7v7TwPdFNMSujU5en3A== X-Received: by 2002:a1c:69c6:: with SMTP id z67-v6mr6002060wmh.159.1530541827439; Mon, 02 Jul 2018 07:30:27 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4-v6sm9489973wmo.20.2018.07.02.07.30.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1ECA73E072E; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:06 +0100 Message-Id: <20180702143021.18864-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::22e Subject: [Qemu-devel] [PATCH v3 05/20] docker: add gcovr to travis image 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Useful for debugging if nothing else as the gcovr on the Travis images are a little old. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/docker/dockerfiles/travis.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index c5ad39b533..03ebfb0ef2 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin From patchwork Mon Jul 2 14:30:07 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: 140776 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp24073ljj; Mon, 2 Jul 2018 07:31:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf36/L5xHabW4NnlGwG+GnBv2steS+Xjf6s9UJNBL3ShS9BTYLUwLujtCp0BupLSspDzCv0 X-Received: by 2002:a37:88c2:: with SMTP id k185-v6mr22492663qkd.102.1530541862625; Mon, 02 Jul 2018 07:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530541862; cv=none; d=google.com; s=arc-20160816; b=TRx6qrFgPV8TsPFCToVY1dImSMhsg524LQFYEGUGtaSJ8Sxc9N75nZg7LloW9CK8xu Dx7+cEaoCvn3E1aCaBNl0eePE2M2IF35m5l/XQ7gUXXDo6n5FHX5nIagsS5DCzptK7RU K0mK4Ogck3DRjH3Fvq1iHO7JK8npbARE+vVdhEkcwsX915ICMlkW9xEFqL0SuUsnL9fm ksOnk1/S7PibTW7u1QB2h+3+ZLdkNPNg//oa6OySw6MxA57xt10yTOh6TbbKsxRdCsSe eRoUU9X7+A8kn+M64EtMKK0+7eP/JMbXzy9ZtiPE+jfbJSq1UgBWGm73b8JJdtpHT/xj s5wA== 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=S8BiLsI7s/sA0sVpBKHltyy1im8BtaazfWlgOgOElIE=; b=dhgQq2Re+fZrqkO2M9WmgRtyiOiGjLhCk1hJvwvVKCTVOH63K0JxzP++UhdMBtV4HP nMZ38IjjsNaWO9PpWu/u1dhhQJeyI6PE+a/ycTN/ffZY3/Vuri2y2lXoalpX5uQHKY/m /Th+lNlskbu8VTKMAsj0MXa8OMZjoyHh1DXOxWhIBw8m6n142qnM/Qr35sP+b74JKouV 43xEcNa16ryblRMlWr/dv0PjdVUDUmcYYxnOmdTlzErVNWc7AvxXrqfHgJY6G/sQLflC cb4BMgvqdqQ5Wtqhpl6mVHHX8v9geA2sKMamkLgxZn0ztFgNzMLnPYZe0DV3+EtEY25U crBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MvZb9P9P; 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 b88-v6si883896qkj.67.2018.07.02.07.31.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:31: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=MvZb9P9P; 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]:33146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzr3-0005Q7-SZ for patch@linaro.org; Mon, 02 Jul 2018 10:31:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqZ-0005NX-34 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqX-0000TU-ON for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:31 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:42976) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqX-0000Sn-IT for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:29 -0400 Received: by mail-wr0-x229.google.com with SMTP id p1-v6so15793279wrs.9 for ; Mon, 02 Jul 2018 07:30:29 -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=S8BiLsI7s/sA0sVpBKHltyy1im8BtaazfWlgOgOElIE=; b=MvZb9P9PyAH133K0lJeQkJGk64JPERaB442ByCNcn2r4nUwXqELEr9Hbh1mtaAKppa qwzKxS4EYDXoxK1nmG6Oj/b+ReECXa+es/XnalaRzZCTKQZrVnuD6u/XxhaBaKOAqQcm gvjfqvmKM00pjKS6rEf62AC8G6BUtpy5VS7GA= 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=S8BiLsI7s/sA0sVpBKHltyy1im8BtaazfWlgOgOElIE=; b=U55Yttdx7JM0CEHz+bQYpjIWopKGPPPT49z6iOEiISQhOfVpZSZda9LgiFwKMSNUze KZKm5cZk8Kt8iFRzxoQUcq0fUFp7o+UHdageMjhV1eclrzIeq08LE5iWn15G8qrfksR3 f4QPxnWy2C5h6BpAot8wp0uQuQYR++iOt5ylFtbr19neJMpZTjEdAeTqvIidIGJJVyc7 E8r4bYkpL4OK57jK8Uih5S6v82HXoQYDwnfe+BBHBfC8aPU+VGIVC6V4W/Tjvl9+GIp9 t5g98fupALc7IhbaNF6ehoZ2xrrwTm1BsAdLg8X7MsTvER+MzTlXoD+ecl3NzTbw9W5/ HGJQ== X-Gm-Message-State: APt69E2wFuz1/+3h3A9JwsfrSFejqEmwz5frTDYCI32IiNpZlfIL6t5N t3K3tQsOO3cVlo9t1HJsLKmuaQ== X-Received: by 2002:adf:9c91:: with SMTP id d17-v6mr12309444wre.11.1530541828344; Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h3-v6sm14734352wrm.8.2018.07.02.07.30.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:23 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3578A3E075D; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:07 +0100 Message-Id: <20180702143021.18864-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::229 Subject: [Qemu-devel] [PATCH v3 06/20] travis: add gcovr summary for GCOV build 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This gives a more useful summary, sorted by descending % coverage, after the tests have run. The final numbers will give an idea if our coverage is getting better or worse. To keep the width sane we need to post process the file that the old gcovr tool generates. This is done with a mix of sed, awk and column in the scripts/coverage-summary.sh script. As quite a lot of lines don't get covered at all we filter out all the 0% lines. If the file doesn't appear it is not being exercised. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- v2 - pushed finagling into scripts/coverage-summary.sh - dropped r-b as a big change v3 - move from scripts to scripts/travis and update MAINTAINERS --- .travis.yml | 3 +++ MAINTAINERS | 1 + scripts/travis/coverage-summary.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100755 scripts/travis/coverage-summary.sh -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 32188d51f1..95be6ec59f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ addons: - libvte-2.90-dev - sparse - uuid-dev + - gcovr # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu # to prevent IRC notifications from forks. This was created using: @@ -86,6 +87,8 @@ matrix: compiler: clang # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + after_success: + - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" diff --git a/MAINTAINERS b/MAINTAINERS index 42a1892d6a..4917b8e48d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2165,6 +2165,7 @@ R: Philippe Mathieu-Daudé L: qemu-devel@nongnu.org S: Maintained F: .travis.yml +F: scripts/travis/ F: .shippable.yml F: tests/docker/ F: tests/vm/ diff --git a/scripts/travis/coverage-summary.sh b/scripts/travis/coverage-summary.sh new file mode 100755 index 0000000000..d7086cf9ca --- /dev/null +++ b/scripts/travis/coverage-summary.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# +# Author: Alex Bennée +# +# Summerise the state of code coverage with gcovr and tweak the output +# to be more sane on Travis hosts. As we expect to be executed on a +# throw away CI instance we do spam temp files all over the shop. You +# most likely don't want to execute this script but just call gcovr +# directly. See also "make coverage-report" +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. + +# first generate the coverage report +gcovr -p -o raw-report.txt + +# strip the full-path and line markers +sed s@$PWD\/@@ raw-report.txt | sed s/[0-9]\*[,-]//g > simplified.txt + +# reflow lines that got split +awk '/.[ch]$/ { printf("%s", $0); next } 1' simplified.txt > rejoined.txt + +# columnify +column -t rejoined.txt > final.txt + +# and dump, stripping out 0% coverage +grep -v "0%" final.txt From patchwork Mon Jul 2 14:30:08 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: 140782 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp30615ljj; Mon, 2 Jul 2018 07:37:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdIxBMeBpcANDJq+UdWznQdbdx4u1VtZ0rDaSpBM0fvscksHfRbLmzM17xDGQd5Nfd6j5A1 X-Received: by 2002:aed:3e29:: with SMTP id l38-v6mr23989790qtf.186.1530542222092; Mon, 02 Jul 2018 07:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542222; cv=none; d=google.com; s=arc-20160816; b=VKe7bqQLXmspSs/fR3ewCByYIMDXlAH65eHyfJ6WPqwjpLNTetdPqHXMwbnDl30YUj eLG0jB4XnhJCxPd684uKd8CfXuUMkjla9QmkRhUXccIh7oXmuuNZhSs1SmYvAqIkvGtQ dpgtf4qd+hIfQXdKYwk4BVCv3a/uSO5HXSKTL3ipGXAfNR1n6I69vZ5r0FqSBIgSFkLl vKwY0UxhMeWLEthtbl9XUMg0vQKNw57c2sFSkqkPiqw0GiZCixsABj3CBudUe+Ri6Axi ZK6ToGi2ww96iyuZ54YTHt2UZS1ruhsjfdg7ygvIZ0lITbqfMzEyEN9SE42uEdsX9Qk3 cVtA== 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=AMkRDj/+DzSk73olAljoglLvRhXqyPyozWchbUwEc9o=; b=tX8lTu7IK3gEgXOfpcDxy21XSrC1jjuWCqzmHc1OnvwsoG/Hjpx+rRLIAkspFuEEEg Y6IRWafcDyBDtflQ79q20+YuMmSswpMgqUDs6ilIrpkCkzTXEvuitSVeuWQqJkLoRlm8 aNYBwwFxX0vDMNXnEx1jg2HaSnKlvUVLkNMF14AqF9dpj0/who+CqeNK39cxlzvb0JYR X0LWb5eAqmtETBkHoEB+XFPszKVsAWiYr3mRxz+khmDlRAVPUWHxm+IIyQGTuO3c3J3O EwTYoXMUD9eabglM5c0KkZzrgdLyWChVfA6mk5cqYetXKJTUdiAc9QEoWZ/AExSHzPPV V9WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GuevOL6n; 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 b6-v6si7536939qtc.19.2018.07.02.07.37.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:37: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=GuevOL6n; 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]:33177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzwr-0001pp-G9 for patch@linaro.org; Mon, 02 Jul 2018 10:37:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqb-0005Ps-M9 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqa-0000VY-Oe for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:33 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:45092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqa-0000Uu-J2 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:32 -0400 Received: by mail-wr0-x242.google.com with SMTP id u7-v6so15773748wrn.12 for ; Mon, 02 Jul 2018 07:30:32 -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=AMkRDj/+DzSk73olAljoglLvRhXqyPyozWchbUwEc9o=; b=GuevOL6n1JA56A+0otUCySepRVFGhCxzZE3rJTFaRJjwMcJH0FdJzwWNQTOfFO+nBS isOe479Fm9uyPFEgZXCnYLC+9wtT2OKS9VkWh6ldcRJCaEUw0NHhZBpJiMPTW5rUP+BJ l8+lfXzBH5M9DERzrQktYxUFI2JRzqAnhncdI= 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=AMkRDj/+DzSk73olAljoglLvRhXqyPyozWchbUwEc9o=; b=Cs845TkgALjUEn0EnIIEFuzM54Ti3rVAJQHrVutVIepUUrTNE/0496ffWHlTJoTOzj 4ji3G3Gg7Okry4qGiwZAENI1hlvv20jfijvGBIKnU5LhOAKeJMbHVhtBjpstgSde52b/ kUMFsNXycF0dwv3bJBsU9stPsaJW+rQPb4077dkznO+T8cE7b4DpEjnsM0QD4hQVekyy 55jFbEw3CczXi6UhkOKQCjcNXjs5/sp2ptmP1jzy9NSq5XZfRo9oDRYhU9u+mMsvbYHS ZzUScqYxoOVYBv/MPaZgW/IIuV63V8YdUDqlwIntXd0SqLs2Zgrr77pjpnx5t8+lK9G2 BYsw== X-Gm-Message-State: APt69E3Z/GISGE+L9wWpQxOZumYbUow0iWDansoE3Wj0e3SkIwG2SVj7 sM2r4zrq9qJreXnvCKf57gJSLQ== X-Received: by 2002:adf:adae:: with SMTP id w43-v6mr20843707wrc.251.1530541831374; Mon, 02 Jul 2018 07:30:31 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f133-v6sm8465245wme.42.2018.07.02.07.30.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4AD153E0775; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:08 +0100 Message-Id: <20180702143021.18864-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::242 Subject: [Qemu-devel] [PATCH v3 07/20] build-system: add clean-coverage target 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This can be used to remove any stale coverage data before any particular test run. This is useful for analysing individual tests. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- v2 - s/to any/to delete any/ --- Makefile | 11 +++++++++++ docs/devel/testing.rst | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/Makefile b/Makefile index 7ed9cc4a21..2b3413a5ba 100644 --- a/Makefile +++ b/Makefile @@ -723,6 +723,14 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") +ifdef CONFIG_GCOV +.PHONY: clean-coverage +clean-coverage: + $(call quiet-command, \ + find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \ + "CLEAN", "coverage files") +endif + clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h @@ -1073,6 +1081,9 @@ endif echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the config' +ifdef CONFIG_GCOV + @echo ' clean-coverage - Remove coverage files' +endif @echo ' distclean - Remove all generated files' @echo ' dist - Build a distributable tarball' @echo '' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 66ef219f69..7f04ca104e 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -161,9 +161,14 @@ GCC gcov support ``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. Then run ``make check`` as usual. -Reports can be obtained by running ``gcov`` command on the output -files under ``$build_dir/tests/``, please read the ``gcov`` -documentation for more information. + +If you want to gather coverage information on a single test the ``make +clean-coverage`` target can be used to delete any existing coverage +information before running a single test. + +Reports can be obtained by running ``gcov`` command +on the output files under ``$build_dir/tests/``, please read the +``gcov`` documentation for more information. QEMU iotests ============ From patchwork Mon Jul 2 14:30:09 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: 140785 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp32939ljj; Mon, 2 Jul 2018 07:39:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfRypUif8o/beY6Jr0dXBUAiy0Uk5DpyqiSlLSD9cGrrqNOxfz7c3UbLsfPEdKfLz7MR54H X-Received: by 2002:a37:3609:: with SMTP id d9-v6mr21538471qka.419.1530542360047; Mon, 02 Jul 2018 07:39:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542360; cv=none; d=google.com; s=arc-20160816; b=JI8Vom0EAvlnGEngOtdcybJwnt+3cfHAqvf6qG7iL3+8s/8w5x8YQLjQh19QjDg61p G6wTLcyzFaf5gbx0580exDfSqBvLWaMdOnk+eNR8EUW4W7AiRvkhSObrTLb1MspDdyOd ZLPzl99G9tH2W52LvKbQc7HHJPxC/99mzOqtym/6bzLRFevMQ66PqFabqqFf+fL1y7Hg RauP7Q8Y6aoKOUgypi3mkj/Yv8JPIoH8ETxD5eP/w4D8EvLk3SHvF55PeqrefV9RTtG2 B54bwSnhRdI06rp98D2KE71oiwhHo+B7Npr8dN/DQ/yDpflxHDVkJqq6wMPf5sDMfKzi 6V5w== 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=bDIq0TKu4RbDKYBliAPOg2srULSqrJVbQbfPc/vEsuU=; b=mG0pOvhDXY2e8mW6tRSFINwZPSRQprEluRg9n5zFf3uvQJZMAspM7+o4D4Lid3Ij/q td7N3BvqX58t3STHnQzLpO4LWoWl40iu60+eQ/MmE0Kf4mCTotW+WrdzSu9knjJdtby3 /POh5Qpjzi9kl0P9La2rVs2hCVV9fWcVfAfhCvxqkuyJWzPLPKnzao2+T8PRxoJYp5Po lN3brtJKqnrlLZHDISGY919XRyqjr5UcNLISAouTnKONYkE0WYdcJVFhxjazBkxaSjw3 Gw957HRd8nY6CBoj1cLSn/TQLLE/OO7A38CBNC1IGxJHTCyKy+yRgNmxLhY6mDQFNDcf Bvug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fh9BZZLg; 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 i31-v6si11267153qva.63.2018.07.02.07.39.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:39:20 -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=fh9BZZLg; 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]:33187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzz5-0003kL-Hu for patch@linaro.org; Mon, 02 Jul 2018 10:39:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqa-0005PI-Sc for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqZ-0000Uq-V3 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:32 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:42501) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqZ-0000UQ-Nb for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:31 -0400 Received: by mail-wr0-x243.google.com with SMTP id p1-v6so15793403wrs.9 for ; Mon, 02 Jul 2018 07:30:31 -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=bDIq0TKu4RbDKYBliAPOg2srULSqrJVbQbfPc/vEsuU=; b=fh9BZZLgVZxQ3vjTudKSmJVVV2JmmiNrsEKSQjjQOv/z0Yt87GTtMjBLO13oGmQ/D4 CCXYCyYX1AS5D09h1fp06NG+C+OULdV7hbxfn7jOVfOQZmZW3+M59ZeQJ82JsaodKqbK pKdfmpW7+F/YWgpluWRT2TSajrRfjk66mMf+U= 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=bDIq0TKu4RbDKYBliAPOg2srULSqrJVbQbfPc/vEsuU=; b=b84jJUTfLE9OVkXftqWUuCk5Vqkx9WQa6HziOx/M+9fjJqzeFluup3V4PbgK7PO09y 6laYWjrkef3ZN6sUYm7k3kxRn+eoYPlUP5NAwNKV9ZSXNMJlXd0WrUx9yhsq9IDnAFai WvPdYLjnNpFraCU0vRR7/9KjulhBzVLg91r+Q6xeqHQBgBH8HQ3lLKxDZpFQFWpJmq/p jsNDZAJU+/Ysqq+ofJepJT5X6Lf4A3qXA4EiC4a6xX5UMaf1RvlzNBKr0Nemb6gaFZf6 LgfVs2z5Y0OknG4giIo5nDZ06X+/rWLGepkGT1VtuKXQ5rGaYliuAtVdacN/tBpJhcGR EFwQ== X-Gm-Message-State: APt69E2RBSJ5Ej0zyVoUbn5j0abXMQiQGCIkX7S1J3siqfpacBp3aNag UsvG24rONbma3p7au+USZwAmi7rqf3E= X-Received: by 2002:adf:a792:: with SMTP id j18-v6mr20456965wrc.187.1530541830604; Mon, 02 Jul 2018 07:30:30 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 39-v6sm7772153wrv.79.2018.07.02.07.30.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5EECD3E07B9; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:09 +0100 Message-Id: <20180702143021.18864-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::243 Subject: [Qemu-devel] [PATCH v3 08/20] build-system: add coverage-report target 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will build a coverage report under the current directory in reports/coverage. At the users option a report can be generated by directly invoking something like: make foo/bar/coverage-report.html Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- v2 - s/generate/create/ --- Makefile | 13 +++++++++++++ docs/devel/testing.rst | 11 ++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 2b3413a5ba..68af7b5d7c 100644 --- a/Makefile +++ b/Makefile @@ -986,6 +986,16 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \ docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi +# Reports/Analysis + +%/coverage-report.html: + @mkdir -p $* + $(call quiet-command,\ + gcovr -p --html --html-details -o $@, \ + "GEN", "coverage-report.html") + +.PHONY: coverage-report +coverage-report: $(CURDIR)/reports/coverage/coverage-report.html ifdef CONFIG_WIN32 @@ -1095,6 +1105,9 @@ endif @echo 'Documentation targets:' @echo ' html info pdf txt' @echo ' - Build documentation in specified format' +ifdef CONFIG_GCOV + @echo ' coverage-report - Create code coverage report' +endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 7f04ca104e..5e19cd50da 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -166,9 +166,14 @@ If you want to gather coverage information on a single test the ``make clean-coverage`` target can be used to delete any existing coverage information before running a single test. -Reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the -``gcov`` documentation for more information. +You can generate a HTML coverage report by executing ``make +coverage-report`` which will create +./reports/coverage/coverage-report.html. If you want to create it +elsewhere simply execute ``make /foo/bar/baz/coverage-report.html``. + +Further analysis can be conducted by running the ``gcov`` command +directly on the various .gcda output files. Please read the ``gcov`` +documentation for more information. QEMU iotests ============ From patchwork Mon Jul 2 14:30:10 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: 140788 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp37220ljj; Mon, 2 Jul 2018 07:43:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdEpV2mu1fH38ALd4u1+788bO05C2XlrIOz92yUancGF4hBYW9u0ojWF+1IN4tGW8JhU0y X-Received: by 2002:aed:2043:: with SMTP id 61-v6mr24051697qta.378.1530542623903; Mon, 02 Jul 2018 07:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542623; cv=none; d=google.com; s=arc-20160816; b=nytH6JUhjnMq/z2DzAAepW7MqeHsVxTS/TuzRhqgQ4lc1iJLHymQeleiV9b9NFT6t2 3VXfrxwn65jV7UR/IeCS/VKZGSFTgZi+nApg0D7kAFy+YUyVvJ1pq8bJ3+z82KVyWXCm BO4EpkmFOsjC3jl1p9+UsddaJPNWhLCEIqh5kmM2i4dy56A65nzVFhUl0zS/lVSVhKVE P4CREfWUeGMCVSgnf0Zrt2NdZPUyuOeRM+8XWSXYjsajHr6ltibVk71C8AMKDZuuLcg1 KGQHFEtM+0BaaCRaxZ37ITl+iHSUOMYxQ89EzX5KkkDhYT0+mwXJyXCR11TdVBb3fYd7 nNmg== 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=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=cHsrSLXxXYISVJezxylnaLMDMxbALCkWkY5CracrLQiIyaafldIifYKGfLjqV06tK7 aXF4NuuwY6vD40x5w7GQkpvnWa2pG8sJ+5dhgygW3iChUV1DHK7xvsskeM+qWP2dEquS Fb8nRCC1Cfyc8e81wXjkoyzLA7OQzf/gHaQ+71cN3Iy/lbZRqEBCFnC+Av5rL0BFaz6h vj0ZGTHADx2qf/iRT4Q44zHBvnXNksBd9zYmKGhNwHTo6b1NhxS7NTYWfbOPDhkYVb4l q1HPiyyMiWqDleix8zkXuZTGQOc6Sp3yxJAAYUvFRaWPg0ky7f2dVaSNJK/LfM1rtIJY olqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dp3Il7+9; 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 y15-v6si1979807qvj.254.2018.07.02.07.43.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:43:43 -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=dp3Il7+9; 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]:33219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa03L-0007VA-7U for patch@linaro.org; Mon, 02 Jul 2018 10:43:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqe-0005Sv-39 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqc-0000WY-II for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqc-0000W9-Aq for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:34 -0400 Received: by mail-wr0-x241.google.com with SMTP id u7-v6so15773836wrn.12 for ; Mon, 02 Jul 2018 07:30:34 -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=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=dp3Il7+9DV7yEDnHO+6ESIhmLSvRtIgSe9J1KeaH4eK0CnspNOdytsJFmkgZu80q9h LNPl26UMAtW2xJasWb+uN9EgjXYxYF1YUuanTKrsvIoZ8+23bzzO2Dmhf8DcCKhrKeA3 SPjjuUZntLkb3icN4uHwS+UECgwaucWNCJnG8= 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=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=FygZL8wMoazTrJ2Dy2QpawhhtS96u4PlUIzxVw9BlP0FD47vMQlZUBOzPCEiqYk2Pb Dvuq7xoZMLs4BA2W2pSMdA8Kc3BXDXK6BS/wesmBpnRdbsMEpxZPRo0zZxP8fqil570G TRwr+ka4jWq3xw8UE76yQhxER37YpMw9MJv1wLxIOJfje/Y72kGRsJYS2W7V0N/svI/G 5tJqVlp55HefqtLWsgIUmRf+/JzvrnNfRnFaFHwa/8EQ16ogq3KlVJl9fE3Axu4SGKAM uUOu93llBW5li1UXi2C2hd5V6ID1NUaTr5A3jym2kB9UOP/cY64t6wq42ARuBVzsxvDw MsnA== X-Gm-Message-State: APt69E0+6IaQvtoKNlWGdIhv6F5K1q1L1xcEGIzierdq4qv5QvtQJtAK +xlACjeOHFitpEPzhy8em0LeHQ== X-Received: by 2002:adf:acc3:: with SMTP id o61-v6mr20829661wrc.34.1530541833181; Mon, 02 Jul 2018 07:30:33 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r194-v6sm337237wmd.36.2018.07.02.07.30.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 764FE3E07D1; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:10 +0100 Message-Id: <20180702143021.18864-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::241 Subject: [Qemu-devel] [PATCH v3 09/20] linux-user: introduce preexit_cleanup 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: pbonzini@redhat.com, Riku Voipio , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" To avoid repeating ourselves move our preexit clean-up code into a helper function. I figured the continuing effort to split of the syscalls made it worthwhile creating a new file for it now. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Laurent Vivier --- linux-user/Makefile.objs | 2 +- linux-user/exit.c | 28 ++++++++++++++++++++++++++++ linux-user/qemu.h | 8 ++++++++ linux-user/syscall.c | 10 ++-------- 4 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 linux-user/exit.c -- 2.17.1 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 59a5c17354..b5dfb71f25 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o + $(TARGET_ABI_DIR)/cpu_loop.o exit.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o diff --git a/linux-user/exit.c b/linux-user/exit.c new file mode 100644 index 0000000000..aed8713fae --- /dev/null +++ b/linux-user/exit.c @@ -0,0 +1,28 @@ +/* + * exit support for qemu + * + * Copyright (c) 2018 Alex Bennée + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ +#include "qemu/osdep.h" +#include "qemu.h" + +void preexit_cleanup(CPUArchState *env, int code) +{ +#ifdef TARGET_GPROF + _mcleanup(); +#endif + gdb_exit(env, code); +} diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 793cd4df04..bb85c81aa4 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -623,6 +623,14 @@ static inline int is_error(abi_long ret) return (abi_ulong)ret >= (abi_ulong)(-4096); } +/** + * preexit_cleanup: housekeeping before the guest exits + * + * env: the CPU state + * code: the exit code + */ +void preexit_cleanup(CPUArchState *env, int code); + /* Include target-specific struct and function definitions; * they may need access to the target-independent structures * above, so include them last. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2117fb13b4..7c66442357 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8018,10 +8018,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } cpu_list_unlock(); -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); _exit(arg1); ret = 0; /* avoid warning */ break; @@ -10127,10 +10124,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef __NR_exit_group /* new thread calls */ case TARGET_NR_exit_group: -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); ret = get_errno(exit_group(arg1)); break; #endif From patchwork Mon Jul 2 14:30:11 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: 140779 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp30116ljj; Mon, 2 Jul 2018 07:36:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcltqctwTAtf7BzfwHo2mt+/K6IRJ86QQG5s5adw3Bi+1gWjidkiRpHq5OFXHVKWttVyxKh X-Received: by 2002:ac8:1b4a:: with SMTP id p10-v6mr19567437qtk.221.1530542191023; Mon, 02 Jul 2018 07:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542191; cv=none; d=google.com; s=arc-20160816; b=YsvA98kEQEgFb2JZ8GNEEFlQugAmbbGbVuYkF73kVAplSmgCeIFKyOT/aVfnw9KHbx /LO95P2N6qPzFRXDmxBL9UsW0w5CmLLNwy7AWUa/Y6XFM2NROqfK/B277oaH0od+U8ZK OttrwtVqsSRvnzqa0Qm6X+GMO1Zd16wTLBPRhFm9jtmyWc+QXjxoQR9Qnro3mt0gCFRZ M/E69a/IYkfMdTh46jV0MQs4SxZUsQAKNYAI+ziHFuOtWeh2DiSi6j13hNmgGaLzDEs0 B8u4NwLDr82Ha1hUnC15gYUY5ZNrWW2Baw7vlFKtMm6HNtdeM5JZspq2jB2J1BfKQQg3 laMg== 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=kmxmf7D1wRCQMWlrMFFuqjwqqZgMGx8Sce56K/tkabU=; b=o9eu9Bj791DNRJ8Xr/p6zKqkwXXxsH+9rw9u0Ya+ip+iCcCwqq8rKRjPk9l7EnNfSd bz1d14Jcpg4pyyiBtTuqxUR2lOwOijlRrZ/aD5cyq8MAB/+tE9zTjttZ5fx1PnZef/iF FHU+AfQQ+dMNikw3R1d+dJGchxB7qkK1US1RvizhqzMJ9ARXMP+szC+b4CUghgnt6frB Jch2/rvtCKo9AdhvYmv7ZWoIx76TGprByRVO8vSQAHOjYlkKqTT1CjjRYzOA+YxkDsKj 8FLICsxuIy4B/ZqramUP6Zek1cIfnoJChSQisbtdNm/IJEYIWkTlFceZxSpLyPcWImPP IWow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TBu6tz+O; 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 p15-v6si1077540qvi.256.2018.07.02.07.36.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:36:31 -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=TBu6tz+O; 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]:33162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzwM-0000Tj-Fc for patch@linaro.org; Mon, 02 Jul 2018 10:36:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqe-0005Sw-3K for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqb-0000W1-Gj for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:39181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqb-0000VN-9y for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:33 -0400 Received: by mail-wm0-x22d.google.com with SMTP id p11-v6so8929310wmc.4 for ; Mon, 02 Jul 2018 07:30:33 -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=kmxmf7D1wRCQMWlrMFFuqjwqqZgMGx8Sce56K/tkabU=; b=TBu6tz+OV2KL8SVgqyWsna790wz7u92IzWgn3wma2pJFRb3ct5D5CPgsA1fZE45Yi/ 5EIhx1y7pqDHd6Nbq/D6ilMh9N/Iprb5sOmMESd86Q6HAmO+oo2lXc7xK4fb+mjywU2E UaJny/bYuv4L+sLtOAessSroKmXVuQfLeNRQI= 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=kmxmf7D1wRCQMWlrMFFuqjwqqZgMGx8Sce56K/tkabU=; b=gMWhPeN9WiUuXVwtaNt1tsIuA/DgCm0klpEeY6D9Cx2tZLyY7s3rFo527PikSmugkf 4vV0/9q3z6tR/9YTQzWv6wAIasEmw+J2FDbU5awPPEkfsF4MjhDvIUvVfOjzXPj0tQjU hXquJckhC32ZkpPwjOY9HyAZaLGfebPNlT1p0RyoegdExFUoPJ7yQhwdu7nrVLgIHlNO JsN4vAC/iS01E+oXHiizeGGdnEIx2g2Cm+r2jiNvR0bptHC8EqLr+np5EHZdxKHlmIBt 3bZrJSuH5igNPjFnciaduGtfkYmnXMw5WdbbqUAKnsAuT9AkIKwcsrzMgl+CU+gd+TBD gt8A== X-Gm-Message-State: APt69E2XDkb/6+S/h8+tuA8T6/o2cQZvI6aL1jqG3DLguO8dRDd+qexS xS6v9go81sUb4U2wUZSiVEzwjA== X-Received: by 2002:a1c:1414:: with SMTP id 20-v6mr8016738wmu.119.1530541832243; Mon, 02 Jul 2018 07:30:32 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i14-v6sm14089301wro.11.2018.07.02.07.30.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 894643E0930; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:11 +0100 Message-Id: <20180702143021.18864-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::22d Subject: [Qemu-devel] [PATCH v3 10/20] linux-user: add gcov support to preexit_cleanup 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: pbonzini@redhat.com, Riku Voipio , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As we don't always take the normal exit path when running a guest we can skip the normal exit destructors where gcov normally dumps it's info. The GCC manual suggests long running programs use __gcov_dump() to flush out the coverage state periodically so we use that here. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- linux-user/exit.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.17.1 diff --git a/linux-user/exit.c b/linux-user/exit.c index aed8713fae..14e94e28fa 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -19,10 +19,17 @@ #include "qemu/osdep.h" #include "qemu.h" +#ifdef CONFIG_GCOV +extern void __gcov_dump(void); +#endif + void preexit_cleanup(CPUArchState *env, int code) { #ifdef TARGET_GPROF _mcleanup(); +#endif +#ifdef CONFIG_GCOV + __gcov_dump(); #endif gdb_exit(env, code); } From patchwork Mon Jul 2 14:30: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: 140781 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp30165ljj; Mon, 2 Jul 2018 07:36:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdwj7ELbw6W8ictaTar7wuUYb9Kkv7a7Iljdk4rA1iCGNXPX9Quw9Nfh2dk0iTgZIxaxQMj X-Received: by 2002:a0c:9c88:: with SMTP id i8-v6mr22997834qvf.193.1530542194106; Mon, 02 Jul 2018 07:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542194; cv=none; d=google.com; s=arc-20160816; b=U8UwWBwWpT1vIfxQFNfapSiz3ExKb+1QYTAelAVEJEsjvFFcm8q65ERcvKsLCYzY9e GebaZFLSsFfIym7IbzkEQOOCu0TvjluKe7ef2l2bd4W6pmoQVQWAOZ3L2Wua7CcCDG4l Wokf3O0+2J+TtVCG5qV0IV/WkmVvWWfRXjussKFv2jaAPqRF4PEADne58U6a562aF3or rVdzGIt0mwCJAzuBrwD1ioIV8K+QDuGGXBpt6xEHaZgOugmE32LitDpkj6jFs//5culY z2dn2k+Ew8KIthFGDK2ZPI7G5IdWll0MdiOVB0cCQ097T91GDClNQgZjNR7faxrSQD/8 uCCw== 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=801BtlulI3v1N0a8n2IOnxXvo7ZXcWNkpX9cQ/Wz+H0=; b=uSxfFbmsWLrTRy84DBk91RP21OE5nLDg1bOy9ZXG/feuGY4Reb28q69F7Kp2LGm1pr GwFN3pmk8v9h6NJkqXRc+1bdElAH+IlMzhcWSkrFGUwtAKPVHswB9eGNNSNT06fq/1OF MA1qD0U7OPb3ubqieNZxD85TrTDiq5zhvHw4Q9umlyCFZm3xZw2MrkqeV2d/WyAArPk3 Pj3y2QhwQ/D4Edc7ENz3ROZkIOo/eXCm3TCLwktI11d7xtDcC586ksx7gLaOQnkDspBW dXsPlxmzwXpe3iuP8kk5WgFzBJgFf+n4jta1sCSXs83xbk3OQ+gzH9irWSamkWX1kz0h BSyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Z8zy/T1K"; 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 d38-v6si1367988qtd.289.2018.07.02.07.36.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:36:34 -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="Z8zy/T1K"; 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]:33164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzwP-0000Wh-Im for patch@linaro.org; Mon, 02 Jul 2018 10:36:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqf-0005Tz-Cw for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqe-0000Xj-At for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:46248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqe-0000X7-4g for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: by mail-wr0-x233.google.com with SMTP id s11-v6so6536360wra.13 for ; Mon, 02 Jul 2018 07:30:36 -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=801BtlulI3v1N0a8n2IOnxXvo7ZXcWNkpX9cQ/Wz+H0=; b=Z8zy/T1KEkFF793myTVzKXf5Sf1io6BvjRkcuKvwDy3aI8dS8Vpkx/dCPwN1ndTLuf V0t9xB8rOXY68e1347OQ2TTJefG7B7SVUkGQZtUOfUvUXzH1Infxq8NpzOqEPkll7z23 pHkQP/LMk0aAY6mgd1rzNUMcE0xa9IeM29UqI= 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=801BtlulI3v1N0a8n2IOnxXvo7ZXcWNkpX9cQ/Wz+H0=; b=tWg7cqjGqbSK11AyQ7D4JkfBvA/S7vdUbECTzb5e23NNjPZWdNtEzBIKN2pybiWHyb i7wSnM8r0LsxRy96bJCBys5OSJ8Gofam8kDyLgIotn1EdRuBLNmuZvS1EISMfqnC0kAk 1wJSwqVxlIjWzEm0aT9OH/bbuBrE32ZztduPA26fKyWBdxwmUhDmr5FF6+58CyjyNztb j6gDgP3TfjRnzWZYDRJvAIRV16hq5BX8ah/UiPUBj3gGYjS6A/7zHFKGsZ5DdqhPz/M6 uxneAepIlmyGgjsFke8u7e7kfctbiKqBMie5dseafSm3qYCfowrTM49CBSVFMM+hSzQ6 0xPg== X-Gm-Message-State: APt69E0/BA8KyDkYbOajSwyOiXagwvs1TvHlzvHtmoF145mHND0MyXSB IOdT707cWeXdLOZulHH2LWe20w== X-Received: by 2002:adf:c7c3:: with SMTP id y3-v6mr19718946wrg.230.1530541834961; Mon, 02 Jul 2018 07:30:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t1-v6sm7980052wmt.40.2018.07.02.07.30.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9CAE43E097F; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:12 +0100 Message-Id: <20180702143021.18864-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::233 Subject: [Qemu-devel] [PATCH v3 11/20] docker: filter out linux-user builds for mingw 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent change from TARGET_DIRS to TARGET_LIST (208ecb3e1) had the effect of defaulting all docker builds to the current configured set of targets. This is actually reasonable behaviour but does run into problems if you have linux-user builds configured and you want to test the windows cross builds. This commit fixes that by adding a DOCKER_FILTER_TARGETS variable which is special-cased for mingw builds so we don't pass the whole set down. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..1813ec0781 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,6 +20,9 @@ DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py TESTS ?= % IMAGES ?= % +# This is used to filter targets from some docker builds +DOCKER_FILTER_TARGETS ?= + CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) @@ -108,6 +111,12 @@ $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ ) \ ) +# Special cases +# mingw/windows builds cannot build linux-user +docker-%-win32-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-%-win64-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-test-mingw@%: DOCKER_FILTER_TARGETS = %-linux-user + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -174,7 +183,7 @@ docker-run: docker-qemu-src $(if $V,,--rm) \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ - -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ + -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(filter-out $(DOCKER_FILTER_TARGETS),$(TARGET_LIST))) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ @@ -195,7 +204,8 @@ docker-run: docker-qemu-src docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) + @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) DOCKER_FILTER_TARGETS=$(DOCKER_FILTER_TARGETS) + docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) From patchwork Mon Jul 2 14:30:13 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: 140791 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp39679ljj; Mon, 2 Jul 2018 07:46:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfl5um64M4hV8pQ9DoqOIMN7ba9/dCUXF3ee7VQQFBs998KfBBsf1pOL5DiLPGPxwixxzQT X-Received: by 2002:a37:1a69:: with SMTP id a102-v6mr22909427qka.43.1530542770677; Mon, 02 Jul 2018 07:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542770; cv=none; d=google.com; s=arc-20160816; b=v6nuCebRGQZ71VWF/VKPpVGrVpd/xFdPkp9faDHFQN/rDRw0X7FDGHErhz1fIEQN7W CsiHr218uyva1wvS+JlwrMzzff/LwbkeGn73Oyt87RLxaQqkp0tEMzKewfglqMktr9p0 cm5RzhNRBYgR8RWXV/zMg6sEPUXQYlHK9OuvTz2JzMijVWIvN0yGaQmOjDGgyqc2GT+L wtjrmkiGCqaOVA3DKw6YqfLDOXqrjjCGQ5V4ZB2qMlUIqZhP/96awBjMJcUz5PZgFlSz SNNZs481OCYbCyMpYbopiAbhwA13MeUHplrU0ZZ/NZp1GFUKGyHzdI0wbwkHsAwbQGFV 85lQ== 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=sBeHvXm/t1SfF3vsnFkcs20PuDdWpHXaUau5jpp2CDY=; b=fVygxqXZSvzW1LtfyIc0P5NZveUCy1BDfljV6rtutzDTNK9LRcR8w9dH4MqjhX8Mly TQfD1pON6husQQZHa9zWTPwcOBbi7VTiL4Iy+F9qWtYSUdLqV8M7ri+HMPRwKQaJtQDt VHt4QO8DRR+eZtx7Qfwdsn4/7yPBWb2uheopbOKb9Z638MqupVjpiqwjxiTrCvdy5yfA YDjsquOUmkwsCaxtKHW9/GWhsPeQet0GFDvXVmBqA9doWsulsEIGIVmlRJNyc29jV0KW RzKmeku134MaQjyazOaP8Z8keJ4bXXuAINg+RfksnJ/IoqV8o2tF5nhQ+zWGKNFXChbE 9qsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cRq0gE5+; 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 c68-v6si1460875qkb.305.2018.07.02.07.46.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:46:10 -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=cRq0gE5+; 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]:33227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa05h-0000OT-Tn for patch@linaro.org; Mon, 02 Jul 2018 10:46:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035Q-Qm for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxu-0005E3-87 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:33853) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxt-0005Cn-V5 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:06 -0400 Received: by mail-wr0-x229.google.com with SMTP id a12-v6so15817041wro.1 for ; Mon, 02 Jul 2018 07:38:05 -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=sBeHvXm/t1SfF3vsnFkcs20PuDdWpHXaUau5jpp2CDY=; b=cRq0gE5+6cd9+5kr6oQ9W8ca7Vg5+Nnv0hcnjuUpkyIgegaAwZyLhHL0gqovZxISH2 sd5ZYAVSm1tpvoqRAT4x9VebThzQ1bgAqioaap/9T8hLc7ygnLptpsf3PKPI/4qJX6ml 5b48WB8rGfQiDnRfIhlHya+eE3Yi81ug7yK9w= 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=sBeHvXm/t1SfF3vsnFkcs20PuDdWpHXaUau5jpp2CDY=; b=Jqwpd3GVps+xENPS90gCmWYs4UiVku2ubsdau1F9ahAMbAg5QFVGo6GD0NEabPHt0G 2FS2L2hDWshiGdwXL5BTe40L7UnWTLAP4qBY9HHvZTtH+bxS1y1mGYbJdw+IK65IycrJ zwT0uqS4hS4DKYkpL+PsTWA7fxQO94n6mGfYXA7Il0PrdBTf71i+obk05dPdbqloC/sG mEaLdeH8hOKvqVmO9gxv7c/ghqp11oZTSP9sFaXy37l6pICcUxK43ti2XMKns9pH5zcv 8o0cYnsu0G0KZwB1m1km/HbIijCR0NN2jdoEkMPxmt/xHzhxSAz2G3vF9owBQ1kNxc5b X5DA== X-Gm-Message-State: APt69E207P73g5UOb8IEw1FGmr32STqtvgk3RWYWJZyJkcbkqALmLJeF nfD87qOBcnLiV0umvJqJ/mNHSg== X-Received: by 2002:adf:9063:: with SMTP id h90-v6mr20576835wrh.147.1530542284862; Mon, 02 Jul 2018 07:38:04 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h193-v6sm16926527wmd.25.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B2A003E0AC0; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:13 +0100 Message-Id: <20180702143021.18864-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::229 Subject: [Qemu-devel] [PATCH v3 12/20] docker: ubuntu: Update the package list before installing new ones 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since docker caches the different layers, updating the package list does not invalidate the previous "apt-get update" layer, and it is likely "apt-get install" hits an outdated repository. See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get This fixes: $ make docker-image-ubuntu V=1 ./tests/docker/docker.py build qemu:ubuntu tests/docker/dockerfiles/ubuntu.docker --add-current-user Sending build context to Docker daemon 3.072kB [...] E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa-dev_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? The command '/bin/sh -c apt-get -y install $PACKAGES' returned a non-zero code: 100 tests/docker/Makefile.include:40: recipe for target 'docker-image-ubuntu' failed make: *** [docker-image-ubuntu] Error 1 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index dabbf2a8a4..c03520ce3f 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -1,7 +1,6 @@ FROM ubuntu:16.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list -RUN apt-get update ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ @@ -13,6 +12,7 @@ ENV PACKAGES flex bison \ libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \ texinfo \ gettext git make ccache python-yaml gcc clang sparse -RUN apt-get -y install $PACKAGES +RUN apt-get update && \ + apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml From patchwork Mon Jul 2 14:30:14 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: 140786 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp35108ljj; Mon, 2 Jul 2018 07:41:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfP2L2sbraOljynIbM8joNe6BXPjrOSGGV1hWi96ffldpdQ9jxsCwr1fQSiMqj4jC3E4JsX X-Received: by 2002:ac8:3477:: with SMTP id v52-v6mr16762542qtb.316.1530542491661; Mon, 02 Jul 2018 07:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542491; cv=none; d=google.com; s=arc-20160816; b=J/5sYRA5Nh8PFDVVGtpmPd7WXS2r/mW4FB9Uzq/svX7gWHw44mRksSvJ2clnEXg4ZV Vnc7U8kvpUKUMkorgryxgIwXOp3kqNnuAVUOeR4typXDZyyPn66XgGiyNY6Zny5BB63n 3Pcwl+fCD/tznGV+vdKi54E0xOXu/1A3qA44uc44q4btVV9YyjzboJF4mMI2lVG5P7wJ kF+6zT2uC6dNVWaWCx9PFvTySk2seOqYjQI4/lrJHemM5Waf0rG4G5DUOn/MkBPaBeAG rIdx6UYoqgIDme4hL5mHTpDF72WhwDexr6/TKBm+epzEKle1+9+4j51sMLFy87QgFcXc Z85Q== 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=4iZ/kUryRgQG6yNa0INGp1DdAB08JEzWBTdxIGO+ftM=; b=LucLrEBe/u7VCa36tOm7ldV049V29RmoYBRtzl5TFJvk6oPFeXdqLZyH8q0tG3wJF8 Y8Wnk3QELP9SqHnKE1JFF3euZ7bkYIbQcJXv7zfZtN7J2TKpkkfCrpcJZePe+0hDq+P1 /Mz//TArAwRldWhVc+K5O34RIPn89PzfCjFmYk3ijjMhfiPQEAedMPk7NCh3C10mvn0y KkcuW7Zc2yYhbquKnZKqhEFsDQksZMiqHYnspliIYCS6CvHMjoYgtROXQexdXNqsdR2Y SQbkLw3b250po3hB/QH3T+peh9WhS3U2HBPdjqAZnSVxRRWTcK9aKvRrxrMOZ3Kyhu9q Zz7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i7bys1vI; 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 g62-v6si2066632qkh.110.2018.07.02.07.41.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:41:31 -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=i7bys1vI; 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]:33210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa01D-0005cN-1S for patch@linaro.org; Mon, 02 Jul 2018 10:41:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqe-0005TJ-AV for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqd-0000Wz-DD for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:39186) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqd-0000Wg-6U for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:35 -0400 Received: by mail-wm0-x232.google.com with SMTP id p11-v6so8929438wmc.4 for ; Mon, 02 Jul 2018 07:30:35 -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=4iZ/kUryRgQG6yNa0INGp1DdAB08JEzWBTdxIGO+ftM=; b=i7bys1vI9+qmszlu+ktdIASWDUUEPZkrL2Z6BeP+dQHoWh9zlqvtBC2MMDx0xlDahM PIYnAd972N6TN8BZ/dbS5540vH2FKKXD3HwOV5/ntbU69iHcsndbuY05XxnB7k8s+TkI R0CNkBVjoySWq8xp3z0bpYlsrjKyL+rpxZm0I= 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=4iZ/kUryRgQG6yNa0INGp1DdAB08JEzWBTdxIGO+ftM=; b=FSguL8JX3Fciq2w6slwACSQpFFG7LwAf+cdhY/QVYSXoX14tAebM9mPmnaRatye/Zm R9RjdU831Nd6BKjWgggwUE38sNwA/HeYS+4IiFivQXdPyCWKiNniURvooqs43kewERJe Gp/PxbOpp02Z5JPXk4S1mP/bPF06rUKmflWlQaUXeIVLty9/Jopxoiw7TCfdPlVp1nLF hH3d+AclTiOP5q4SlNhUYuyZpQDy/bL5Oywt77MLeaExZvQe4RkZuPxyKgk7yiPcSKQ6 F3/mT7a/TMnoN1/QK81UHGEvjxopcCo0Lsyz+DIoxox+ZlwrmAfxRd0JyfVkcsD40JYa liNg== X-Gm-Message-State: APt69E3aY3U+7dGs9JexjB0N/yt54JXn09NuotTn85WDyirOzBD8mtk7 yVxO67q3Q8tnQIjbBosChyHytQ== X-Received: by 2002:a1c:6444:: with SMTP id y65-v6mr4281747wmb.98.1530541834141; Mon, 02 Jul 2018 07:30:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s9-v6sm5918902wmc.34.2018.07.02.07.30.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C7CF43E0B3C; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:14 +0100 Message-Id: <20180702143021.18864-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::232 Subject: [Qemu-devel] [PATCH v3 13/20] docker: ubuntu: Use SDL2 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Do not test the deprecated API versions (see cabd35840749d). Debian MXE MinGW cross images are already using SDL2. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index c03520ce3f..7d724e7f53 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -5,7 +5,7 @@ ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ - libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ + libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \ libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \ libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \ libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \ @@ -15,4 +15,4 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml +ENV FEATURES clang pyyaml sdl2 From patchwork Mon Jul 2 14:30:15 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: 140793 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp41636ljj; Mon, 2 Jul 2018 07:48:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeMpurBXZQxfqrLsOpJ3CDmQp87OB5wdYF6CeOk+y+hvChlRn46DgBBOc+VgWx7HxP1UINn X-Received: by 2002:ac8:b05:: with SMTP id e5-v6mr22572068qti.16.1530542882253; Mon, 02 Jul 2018 07:48:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542882; cv=none; d=google.com; s=arc-20160816; b=olVI25+YUgKxEZYSWtLjoOt0etjSL+5z2GqegyrmGwxuumTA0B7tBKTmgp1m/kxUmY HJqotnydO4ajZem/RBoQP8jYpwXQLfs1oTtzxLaky5IxXZXgVThC115+8Zv0VRDh8EgY BxX4Iq6gY+BvhGiM32jU4IWVmTb28+PGbZ1h8+703uyTCXmAEmGnFuKBcia1YhPSO59d zBYc4+N5hVFc5mwdVu5JNl210BCjY3JFcr2FUQzDucbe2XV9X90AIt4hgRpTcG4J0vzR kROItL6VqmMwwTdpWYLZg5EmuvnL+fehlOMi9NLsRnAsdFJQSFgr0Nx1DRtHq+gbvRW8 lrHg== 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=KKbF4XSMGyuiTJztGPVnneBQcul0zfsOLp4qF+vUBUg=; b=vjFUyQWTPL93YwKQ4gURU8Lfma1cQTUaliP+07lbGVJ+HaAtC+lScCnmj5bzCbI+Bk 38eEmkZKH5ZqAvgGf4suHoT7fGXTiUAJIOVW/oZVyzHvKbvH2pthtlClBAHCR9G/uvuW RCfm2GRv31Y9pIX9lnNYAartXPUWuHHNDols5ywk5fZuuCPcReRLhuHozaYLERCJl9vt CgJxUVdbs4GT1yNHMoGrbAziJO8VvsoU21E9O3CZeMOCNIH6BT7v6mnEz5m1fUsnVMlb 8ocA5yLmsUf9HQD94e52K7P8IyWRmYfjoZRDmL19vHPYEYiJqZKsXMOkeQadh2M3oCcz TlKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DKj0W9dF; 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 p26-v6si4840602qki.262.2018.07.02.07.48.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:48: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=DKj0W9dF; 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]:33240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa07V-0001oY-KW for patch@linaro.org; Mon, 02 Jul 2018 10:48:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqg-0005Uv-4o for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqf-0000YL-6S for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:38 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:46239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqe-0000Xp-Vb for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: by mail-wr0-x229.google.com with SMTP id s11-v6so6536420wra.13 for ; Mon, 02 Jul 2018 07:30:36 -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=KKbF4XSMGyuiTJztGPVnneBQcul0zfsOLp4qF+vUBUg=; b=DKj0W9dF9ZehEUE/v8q5S+bn2xCSJZQKpYLBLMaRNzvGPNwgeYwUDRxyKxDuBBeLHC bBRrcSWvu8rytwJ1qv/pf1wa/XgYCmstoIWfMspW7xf9umBXCHU/5LyljcHIL72apo+f Ig43MPSBLzuqAmQz3B3WJRG1a0kaH5pylpJBg= 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=KKbF4XSMGyuiTJztGPVnneBQcul0zfsOLp4qF+vUBUg=; b=Ov6Kh36gkqp9LTlscBjFAT5WVLjx+ZcX5880esSjmVMMWhonYlnKmzvb4As/SFtsWU VCziJYKc3AbGzdasp88cTqYjhBVhYg7g7OKcid4ACm50+g5acfbcieyP6AbHeCQPfmgD UMD2AEbuRL/rUn0f2UAQwNpLBV6Q/WNHqOOJiMa7qjMv+Sj5EVaAgZYiYn7oBxo/IHtH ar1rZ80Jy3okt5Z4ktF7r6cxp0gvejTdP6d233E89/w+oR7ye500UyX8M5gnb6/hyzSw SUpjXE/MgLReiQ6GjtV31plX2G3w5ygruAhyHbAWFT/zILmWAwSEOJorVw6A6fqCHnYY KnHw== X-Gm-Message-State: APt69E2G8OiLHcR3+b7mBNe1uZ2Lzt0tFh5FjVJeJDsYU5NmknZp1sxU glCRKMAYhjPSp6aAFI9XMCu8sg== X-Received: by 2002:adf:f10f:: with SMTP id r15-v6mr19157593wro.134.1530541835917; Mon, 02 Jul 2018 07:30:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j131-v6sm8948903wmb.25.2018.07.02.07.30.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DB78C3E0B46; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:15 +0100 Message-Id: <20180702143021.18864-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::229 Subject: [Qemu-devel] [PATCH v3 14/20] docker: Clean the MXE base image 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Using the duplicated same package is confusing. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian8-mxe.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker index 9b8e577b03..2df4cc8c5c 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian8-mxe.docker @@ -14,6 +14,6 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ libpython2.7-stdlib \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) ENV PATH $PATH:/usr/lib/mxe/usr/bin/ From patchwork Mon Jul 2 14:30:16 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: 140792 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp40146ljj; Mon, 2 Jul 2018 07:46:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpewcOn/sQ31UBdC/oAfA43IWvj2yMjN4t5QprnznPDjFaUxehJ7b5zkme/4hRCVcYpbLlMO X-Received: by 2002:ac8:31e:: with SMTP id q30-v6mr23749120qtg.255.1530542797205; Mon, 02 Jul 2018 07:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542797; cv=none; d=google.com; s=arc-20160816; b=P841EUIbm6GXrKrQssTKJYcpwM4L4JXQENpUeK9MUxVZ/SIqHRx3HqDokQH1CAPy8U 4q4zsAsIVujjtGXyymQbgY+f7sl58dOL2YWfw2HEJBcLIte46OPCdVr002ITzMrLxyxO WTAFmtEn3R4UuQ8BkoBUAbEXIlDTlFqpcdS3IWkzz1AeqzbrTEiLheSkGK70SG7Z/ay8 SkUNG4yTUiCav7OP0DmnXsJv9kSwmgsQFHqK0+4aXlwrm0HNO2DiQHkmsJN90Lb4jBia XTAY9J87cJsUBNoiR04kA/LCY/ya8aQtoyLGvSggHIDeaDWaQSKGDlmGlEzwlNTk7QGI BuaA== 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=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=YToPg2jtzugPHpM+XGLwqfzpmcbq7u7vhKHgbDLkLozknl9o79UUtlFZqmggxhat+A 5dml2TKZXJsEWUmtNHqq4ZmXXnoTiDRjIkwGYWg2LmFzgfNFklIMAzJN8M02e8NJ8nBI SCak/8x0fMwnOhKP6K/fZw3jgqLtGv53qENhu8Rqdv+uHUl8i1hfzrg3dcPvHJniekNi lG3e7F9M+BmV5va+EAjSPE83Vps6SMM7QrYlpr7fOHvLG+LJHsqlWG6dhDkAv0KSGTp5 uRX4AZAanddM5jAirPKriZ05dwj0wkS3lfb6XjjwZGYNAVGjr9N6t93cCfPjoCanu1yc Wr6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hpkbDt6S; 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 x10-v6si4213824qkx.258.2018.07.02.07.46.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:46:37 -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=hpkbDt6S; 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]:33239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa068-0001SE-N4 for patch@linaro.org; Mon, 02 Jul 2018 10:46:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxx-00036J-Rb for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxw-0005Ga-RK for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:38742) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxw-0005Ft-J4 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: by mail-wm0-x236.google.com with SMTP id 69-v6so8961597wmf.3 for ; Mon, 02 Jul 2018 07:38:08 -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=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=hpkbDt6SACNBBl4LdkxRyH/5xcQHvS6asZIfQObgrZKZbsI3gaPCg19C743ZQfOozP xx+jAgSc956BKFiv1CwUPow6/f9cCrSgCUl1PoxPUmaGcSbqg807T4bpkEwd1SEmAQ58 Zi6fMDv0ZaOC7njFYT4kHmLAvkql0kV8cCqXM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=bLVrSS/gPEOa+nSCtQkQZE/zlqos/2RCrarT8Jb+whhxpQuH3KoRl2wSR3iIHTpv4x kCSGUZk5e7AYpodWOtIXEl5xWiFo7odgHdzSX2L6OmpxStjLCfCr+tUk1STyQRxOKmXS SaolxIsaHM/TxQdPVClwujMf0o6t/zvnFmakRY5aJLlTnwI+KoD9dQF9aZVPAmixyGXF a0Ywq4OA8d2jT2GX7qtZAm+RK5/vKN6e3crzjhnhUlL4c1F1e+J8bRCQcw7zImNylKrx MTF11Bn3SmIb47mklAoUb9QjYLfsENof2ABxH/CidgHB4BVm2eOeN4IoyXEUZPLwlmpQ DdkA== X-Gm-Message-State: APt69E2Q+cWpoSOdDw7mrKd/NV+68wDFCYI1nf/PChn/q/gi2C1UIHXm 2aKFRIlm58Yr98bUzGYWCcXLqQ== X-Received: by 2002:a1c:6a1a:: with SMTP id f26-v6mr1138542wmc.1.1530542287263; Mon, 02 Jul 2018 07:38:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v14-v6sm14150341wro.33.2018.07.02.07.38.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:05 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EEB053E0274; Mon, 2 Jul 2018 15:30:22 +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, 2 Jul 2018 15:30:16 +0100 Message-Id: <20180702143021.18864-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::236 Subject: [Qemu-devel] [PATCH v3 15/20] docker: Do not run tests in 'intermediate' images 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1813ec0781..8641f5da2c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -101,7 +103,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Mon Jul 2 14:30:17 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: 140789 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp37277ljj; Mon, 2 Jul 2018 07:43:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpchHiQEsU6I4rfQqkyroOZYbAF5k7vRidijXIZ/Cz41wkfQu/9A9S0f9JiKod88nNfRXIO7 X-Received: by 2002:ac8:4312:: with SMTP id z18-v6mr8301531qtm.295.1530542628166; Mon, 02 Jul 2018 07:43:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542628; cv=none; d=google.com; s=arc-20160816; b=CqDdL1toDa97Meez7LtFplE+ChAki+Ql4fzGEaJLaAJ9Nzd7Fy/k0x+ADkc+520rXI K6vkPC7nsQ5dIpSrrVnL0+S/HPTEiJJA0Hw1DZipXRvbGiAlbZFJEFCHR8wfjAlpk0Ra Gfqv69sSG1OMwO+FXAk/kupSfI9mzE/VlU6dW19F434XKqsKJ8beCJ5+8hFhdb2vZy20 7z6yFlQYeF0FOpUXLkmflXkOBqCHaks//ot7dxHbDZJEM0+MVZLQuIljNtOoqpCbO4Ri 6CfWJ+UCDdqTFBAeM6uAbRd+0RZeTv2cmHuvl7Q2Y4qQclAuhrZb1rhNF1srV3C8fPck CQfA== 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=7lfiTpG7kvl7qjJGXxWJRPLNxGL34x70fj4aKiiaXts=; b=tWgIlLinIjiR4uCMLuY/3T6dMjlh9VLkyq1B4nS0jax5mYVdepCxLYrRRV+LeR4KwT IBdk+PCh/NqCb1EhBTvMks1LVrBYGyJ2DporBPdxkMjmgS8iWaYE78YWOrFV9j1rytOn UdbVQc0JVNotZv9ee0WzFrAiV17rAeXFvZ16CFqnyf+B/8A1TgOg/RoZzW7U8/b8/cky 7WTnu1immhqhIFV2vUzB5ZwFxysclO1FwCw4hD7X024yrKZYjNemQQpPtbapQMopq0Tg rL0+AdAj+diWJ6LSUdG+Ur1Li69e59DfF4EDcwJ+T/rB6UWSJ4983vQQwL4Kq/sdmpl2 sRhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kfhLvrUl; 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 j23-v6si4500864qtj.7.2018.07.02.07.43.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:43: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=kfhLvrUl; 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]:33216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa03P-0006tL-L2 for patch@linaro.org; Mon, 02 Jul 2018 10:43:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035G-OU for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxs-0005Bu-ED for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:33862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxs-0005Ax-83 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:04 -0400 Received: by mail-wr0-x233.google.com with SMTP id a12-v6so15816933wro.1 for ; Mon, 02 Jul 2018 07:38:04 -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=7lfiTpG7kvl7qjJGXxWJRPLNxGL34x70fj4aKiiaXts=; b=kfhLvrUlou5odhrXN49Z5LBOnCfOt0POO5349jG+w+d4+gQPpLkfe9kQ2symrlxc82 5Wv0oGjJSNyGGn5yoZrECZafJ7FbY0p4zzNXvZu4o18avP1Vyn5pNtAt+TTRZcLo/5Gf 5ZHqKMVyrFgicbTcjZCs4RmXGbaD/caqgDluo= 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=7lfiTpG7kvl7qjJGXxWJRPLNxGL34x70fj4aKiiaXts=; b=SagT+3Mlm7pMuVXgaU7jXkG6/HWp/XSGJcbbYytH3Jxhga0BIwMmhG3Hk+zDSJtAYv Z3wlJytYJGsHwoOWVrr7hC4SlqqOOX7DPDapfoZYu1LmkkuQtIWb90aYqkRqAnxMP5gq MJqZT4Gf8e2OFZIJbSiXDgLCiYdUVQdZN8xucn95lgog5TBJvw9zd9eE9miVZIejc+pl lLr/PnqlezlkyN6jKiHlcfVk8Tqw+4vHB/Lq/SUqev1DRCW3VEs1C6BfU5Ox4/XtDjUU w4CwdEZEvlXQe+PP+y8d0q+Hs/nLqt2VTEqaWc5XyIZ0fvrXuvfxzS1zPH1eb9hBBqT0 A0rA== X-Gm-Message-State: APt69E0ZZuDexMWpDbhuvZOqnYGQogoHVobrSykrPJS5E5yzCL8CF0Gx Hqzpv7PQoWFmI/H0xRZlvahVfA== X-Received: by 2002:adf:ea87:: with SMTP id s7-v6mr18645668wrm.150.1530542283152; Mon, 02 Jul 2018 07:38:03 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h102-v6sm2227827wrh.60.2018.07.02.07.38.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 112D03E0B55; Mon, 2 Jul 2018 15:30:23 +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, 2 Jul 2018 15:30:17 +0100 Message-Id: <20180702143021.18864-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::233 Subject: [Qemu-devel] [PATCH v3 16/20] docker: drop QEMU build-dep from bootstrap 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is best done with any child images that actually need it. Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-bootstrap.docker | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker index 3a9125e497..14212b9cf4 100644 --- a/tests/docker/dockerfiles/debian-bootstrap.docker +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -17,5 +17,3 @@ RUN /debootstrap/debootstrap --second-stage # At this point we can install additional packages if we want # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y build-dep qemu From patchwork Mon Jul 2 14:30:18 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: 140794 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp42160ljj; Mon, 2 Jul 2018 07:48:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpevHyUcEJXYGEXp5trxAErybB2Xp8fya4n/w9B8k521aC5oGKh5CV9dH6J8WulpAWqxBYhu X-Received: by 2002:ac8:530d:: with SMTP id t13-v6mr4918880qtn.396.1530542915921; Mon, 02 Jul 2018 07:48:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542915; cv=none; d=google.com; s=arc-20160816; b=JOnz+4PVW6Lbu53/4/6+BWw4fKW7Jw4wO+g7YVNpB01sD+QjiqZoWvvexK66FT2zpq zXMoiwJ13fVrVnZqJMl43GvZt7LIcdF/yzQd9hIwmgPdjCaQ63RhN8fD6BRi67l6Fizr dEcd9Gvt2f0PFtpuBe+krUvcO1bozBUhsw6fqEppmY04z0g32nlljnKlTpifjKbDVFe+ kb3iW59CN0ASR/I/HvgYhXpnYlwezPs8nMTwo4s+z9g6cMMK60PoQ+v8foLt3q05JpNs hPjC1wr1DfPfJ+g3Iy72w2P09gaTxhMUalllJsxrq1UylY4Ulrw+BGkejUpUPBeGfGw2 CmGQ== 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=yz6i5tqzWoXvLEggjJPEYg+DnnCR4zEmF2RbxVVKK2I=; b=aVwm351Zxdmc8JODwekQeVPjpbvSYXZjDJd7wHzwutHch+vgg3mi6AkwQybAhMe+k4 d2R5orAN4OHBJzHwOjNkz9catnR665fV/tP4x6qGrKhFcuBQLJet3hmj7W6vxHkfyHeg L1TuxMiYJcCr6H9YsDU4ZBS5eNqxRnTh7THkI2G3UY3twwQsBUm+Iyz+aDGpnpYLBR2N ucIgsggbfH1XAUNEThbH7tMaILrvsJIXAgJ6QPXAD4AR0TF4FgdoEg28Ytl0Nvga5LoZ OSocqf1CeJuQRtJiuA5NLawVsLLoL3IvAT2WsAPIN6UE9koQ1gMr4brJRqchFXCiixvr s45g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dg9NWlbi; 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 m54-v6si1624667qvh.220.2018.07.02.07.48.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:48:35 -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=dg9NWlbi; 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]:33241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa083-0002Ff-Cw for patch@linaro.org; Mon, 02 Jul 2018 10:48:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035J-Pj for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxv-0005FI-7x for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxv-0005EI-0d for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:07 -0400 Received: by mail-wm0-x243.google.com with SMTP id n17-v6so9010616wmh.2 for ; Mon, 02 Jul 2018 07:38:06 -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=yz6i5tqzWoXvLEggjJPEYg+DnnCR4zEmF2RbxVVKK2I=; b=dg9NWlbirBxdH7sou+N+kJ5J/+sbwTreDwnSLtFyNenSmAXS0LOHOIElRtkMTggCwu p7k1xQBtFziJkDsxM3+r0uIAj8AtsBEQv4nFsFJFmDNfj+nrrEdrl4kgvqmkHwIM0iHW pm58RiNJRqRbJl1u91q/d40TroS9XwpqKflQo= 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=yz6i5tqzWoXvLEggjJPEYg+DnnCR4zEmF2RbxVVKK2I=; b=Rjpmqa1vxgF07+ivbIcqdYbYOIjzP85EyHIK466br3pyifnHCdpjNW5VUkrHZWEiV6 lzjLsJJbTdOmXE02fCGI7XVqU1u0oKjS/SGVwIgxf5USnxrwMeWuqTm5AUiyVCmIbDr5 yUyD99/BIqFkDbCbXDaTaGQLmrdvzQGy4X++xH44Xt2QUnAzQdlsDZV0ucOxL+DRNYDn qlfviRUcbK+9559iR0i6OZBxP9g7vp8K+Y52l8IwXJNYa43x3VsGurkJbIAKp9epHTs8 YMOJ76ESu+9iuawlJVlf63NgTtkHpQavtn02d1wopbQzPB3ioArr3lAMQjQv7/Kv82Is PkmA== X-Gm-Message-State: APt69E27tSOtxBzoyqPwbX9hr2x5IEfPdtgGSj8B/FR4orFoh+N5umNy wpASy39Mj4THKo3GaKK0082ubw== X-Received: by 2002:a1c:c90:: with SMTP id 138-v6mr8054187wmm.110.1530542285841; Mon, 02 Jul 2018 07:38:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 131-v6sm20364866wmm.31.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 249FF3E0B6C; Mon, 2 Jul 2018 15:30:23 +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, 2 Jul 2018 15:30:18 +0100 Message-Id: <20180702143021.18864-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::243 Subject: [Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We default to the buildd variant as most of our images are for building. However lets give the user the ability to specify "minbase" if they want to create a simple base image for experimentation. Allowing the tweaking of DEB_URL means we can also bootstrap other Debian based OS's. For example: make docker-binfmt-image-debian-ubuntu-bionic-arm64 \ DEB_ARCH=arm64 DEB_TYPE=bionic \ DEB_VARIANT=minbase DEB_URL=http://ports.ubuntu.com/ \ EXECUTABLE=./aarch64-linux-user/qemu-aarch64 Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-bootstrap.pre | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 7c76dce663..56e1aa7a21 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -32,6 +32,15 @@ if [ -z "${DEB_TYPE}" ]; then fi +# The following allow finer grain control over the defaults +if [ -z "${DEB_VARIANT}" ]; then + DEB_VARIANT=buildd +fi + +if [ -z "${DEB_URL}" ]; then + DEB_URL="http://httpredir.debian.org/debian" +fi + # We check in order for # # - DEBOOTSTRAP_DIR pointing at a development checkout @@ -107,5 +116,5 @@ fi echo "Building a rootfs using ${FAKEROOT} and ${DEBOOTSTRAP} ${DEB_ARCH}/${DEB_TYPE}" -${FAKEROOT} ${DEBOOTSTRAP} --variant=buildd --foreign --arch=$DEB_ARCH $DEB_TYPE . http://httpredir.debian.org/debian || exit 1 +${FAKEROOT} ${DEBOOTSTRAP} --variant=$DEB_VARIANT --foreign --arch=$DEB_ARCH $DEB_TYPE . $DEB_URL || exit 1 exit 0 From patchwork Mon Jul 2 14:30:19 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: 140790 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp39571ljj; Mon, 2 Jul 2018 07:46:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpciOZsxs7Vi9OU1p82EOclXsi8ss0iy5G06VJLJ2Y62k08T3/mEhS71z25uZjqoDCe0xF12 X-Received: by 2002:a37:5687:: with SMTP id k129-v6mr22813147qkb.163.1530542763959; Mon, 02 Jul 2018 07:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542763; cv=none; d=google.com; s=arc-20160816; b=IR8F1lF716XLue2pqZi5VBjf3MbjNtctjYiR84MDUdFVa45nTICYIDt7KrMXpNMQdf j5QACpj7u6g6oYPF8mHGy7jS4aWblIpQN329tfHiL701HsOf40GXyX8j6R2qDlH0tZXS xzYV0O8BFEH7SgqXwE5hz2wXQw9zglgvDQjiSI17oHeiEwICAInGROsLmJ7M/c2RxJXb wATMq+NyoQRRBbfjPH6cMgskiaTl6HWtUlVEbHcqAegIEvYEa7u1saoQUEi45EM2LiuQ +u+7bhU+8xA3pJCEg9CEYEGaGp8dng4vDvYH5WH0GQEopMF1OpaAGZ+Jh2mdqj4Rbscq XLwg== 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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=x49fsM21m9YQ78yDJesUkxbwuDcU9A3ng8v80q0I85MdIHROHLnvEnIRIjR4/S2Iy6 5IXfIYGvzF7ZOo4U6HQxma8Iaoy4gtXCnZsvPj/qBSFqalTT2O6Uj+JXr1Y+y1+JPQME E29X2P/68PvrVB/GKe9+/Kbyf3JxjMD3krtV+1Bnv5FE705RGoMc6802s44opAAO8Ncb YCPOfPtsjFvbY7nGbl0xxvmk62U7f8VbvXEz8Pyurdm3vCC7fjxTkP46pU1dIqAm5Hl+ 84JW8JQCSZ13Obq+iTZ2vbGUVGadS/M18GipDFSaMkFTwUR6W/KbBuaFcSQGp3v68Ohc Iobg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WaYzN+sb; 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 e63-v6si2316364qtb.5.2018.07.02.07.46.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:46:03 -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=WaYzN+sb; 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]:33226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa05b-0000H7-51 for patch@linaro.org; Mon, 02 Jul 2018 10:46:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035I-PW for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxt-0005Ch-8W for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:38733) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxt-0005Bn-0U for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:05 -0400 Received: by mail-wm0-x22d.google.com with SMTP id 69-v6so8961357wmf.3 for ; Mon, 02 Jul 2018 07:38:04 -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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=WaYzN+sbThUOZhr0RxrJq5iVuyXV66hR6xwo+qorRIEdXz4UXoFlUZOH6ALAx7fT1f h9qWYrbKqw5KqGZXEKUT+zG0Nr8P7+o6SaMvix4a3seZKLHSh9YWKBctk5mQ0JYWT39C BmxUb8RIaj5TweGD0ZbR7CDQgfcFrIZqD1tac= 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=KvBRF7k12Fj7sP/xS61WUQpDD6AkSj7CddHTemC2z9s=; b=sZapj4dZEmxY05SOi1uHxlgEydXD6YZhYalKZt3Sy7bTHDoQRUWimi0VXsoJuFM9UX UT8Zsm5mbYH03whkYy+ojmjTbY298+faiMXlHqlMf1OmwfrhQ6q7edUefb1cbBdTQmBO FLa+DIGYN6xR2o1t1E/Xj2sISzIo2wpcKwbv7EgMOGi81IzoPRv4IQRgvHLE/snoExwA w2TQXV6M50lb1V99kds6E+9vYW8I9OtB/sU7Wsb5L1G/mP6ASy7TTQYk0Og1LFuN8BHS SxAhEenpARFHey0l8Pd16xtlG5zvmGFG+bJYb+Gyn8pC1toYyXMO7wrwLoYPYdxwonsD qO8g== X-Gm-Message-State: APt69E2sMpO/t1+CDRAZWdMAkX6NepsudyLoz/44MPkUDiZY3+OsZEu9 FxXoRFC32nT1ng3imC2TzEg8Yw== X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr1008604wmp.78.1530542283927; Mon, 02 Jul 2018 07:38:03 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s10-v6sm11683195wmb.12.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 37D4F3E0B71; Mon, 2 Jul 2018 15:30:23 +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, 2 Jul 2018 15:30:19 +0100 Message-Id: <20180702143021.18864-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::22d Subject: [Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These will have been build with debootstrap so we need to check against the debian-bootstrap dockerfile. This does mean sticking to debian-FOO-user as the naming conventions for boot-strapped images. The actual cross image is built on top. Signed-off-by: Alex Bennée --- v3 - don't include stray whitespace fix --- tests/docker/docker.py | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..69e7130db7 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir): _copy_with_mkdir(l , dest_dir, so_path) def _read_qemu_dockerfile(img_name): + # special case for Debian linux-user images + if img_name.startswith("debian") and img_name.endswith("user"): + img_name = "debian-bootstrap" + df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read() From patchwork Mon Jul 2 14:30:20 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: 140787 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp35701ljj; Mon, 2 Jul 2018 07:42:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd+fllgO2F8XINPx9mJBxdO2n3cAekO/UryMSsTF2WiXDuoNTIZF94fD09NGauPsVJLK2F5 X-Received: by 2002:a37:258b:: with SMTP id l11-v6mr21623548qkl.438.1530542529443; Mon, 02 Jul 2018 07:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542529; cv=none; d=google.com; s=arc-20160816; b=vgAd+4E1piZX6hweeLbvaEcYiL0gQ3AIWd/d2qCjYgdvZBCUuSYFWqFWqw+l4fDJmC II9lMa9tTWHQH2veeV+DcnTdU6fke3y0TUvu2A4P9oa+nhqzY1xmlmgtNMcpnn1QiL92 jNTGq9fHWZ/f+krZ/CW1nQYmpYDSjYdYHAy9l6bygbjxYeAJ06KvcDgvXtfPUnAlg9nM fllNdWm5QT7n+RbP0+GPenGeFNJAmoFdddc9LAuZMaW7gu4dRL99UjhJ7ziQLArW5gT4 gfPAtHWrTQHqW7HE5QZ7rwYJmXXkUqVCOwjW5tmQmonR1RsZASE6H1I6UxA+qv3UIN8j 9Jbw== 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=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=G/ZJ+FwYShwgv3A1oigpXRLe/Ssbo3zVS75WfveuEJrmpRm4gSM1avmyTlaj7QK548 YdTH2Hz/PRPRFTDdvBCjMDIes7114d6htf2sw3bmLYg+GbSh2TjEd3eQbFXqeRlitkoN pg6BkleXXLYunzA1Xs4JznKOtVGFEiuxQdcCEnKd83iEjOdipN9aDzem4N0V8bpM8QlV LiXnizpdLL+sfIVBJqa1rkD04jZAto7LU+jC8XMohyjvJPaVYdqSYtcSzHRC0Z8VZiz/ Xzw2tEuer1f+79Km6kVa1QViE30fWmSR1RIpKJkR8pX5J2lgOJWt0MWSbifsG6qiUqRq CY2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ePesqPGa; 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 d192-v6si4725885qkb.390.2018.07.02.07.42.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:42:09 -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=ePesqPGa; 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]:33213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa01o-00064p-OT for patch@linaro.org; Mon, 02 Jul 2018 10:42:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035K-Pe for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxr-0005BF-PU for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:53109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxr-0005Ad-JQ for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:03 -0400 Received: by mail-wm0-x230.google.com with SMTP id w16-v6so8652847wmc.2 for ; Mon, 02 Jul 2018 07:38:03 -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=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=ePesqPGaicBt1fYqi41r/MM12oRpKiHnV3WIoBh5bNRtizmba7d586L85QMJsfWiBq pVaqZy9ujlgei3QDr54onLMSFeD6A6u0bwBI1UuwYWg0xwL+MDHRfQG/+i315SSeanvg l2jzkkoSWujNhwrM6EEqdXYoVlo3CMj1hiqHE= 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=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=ICxhXlGBXQpIDnc8F9nlvm1nbThNtn1saerXm0jiJDMIs0dnByz2svryUtslatWBNY 5zXHm+ms2EYV3iH/TnUuCZtI/ngGh49Vj/GCcYd7SYzXmRffo6g48KX5CBapAmVTg1YX +rKemtHuKH/U8v+dL1yr0FCFdSq7vV1EKfPG4ROdq1ekP85Ok2WW9B+IlJspolf28GVw BvM8jPXgceS3WtAt519XUDj9v3Bz82G6Znp9eea6K3mq49hqcFFZdAEDFB8u9ovbqJRN OkZGMD0T5Rx+qeDPpuBsLttZc/sLqGNE/hplyIo3OQdSBX4JChWQNgTrMJbB5oIutRIh TdFQ== X-Gm-Message-State: APt69E0h7dID7gA6TIt6pU+0eAZx5MgcrGBTLnV23BniJDdqIbekKzYQ dfnm/vpgdKIX3/JzbNzjczCtSA== X-Received: by 2002:a1c:6709:: with SMTP id b9-v6mr7923679wmc.30.1530542282434; Mon, 02 Jul 2018 07:38:02 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r9-v6sm12701492wrs.63.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4C2D53E0B75; Mon, 2 Jul 2018 15:30:23 +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, 2 Jul 2018 15:30:20 +0100 Message-Id: <20180702143021.18864-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c09::230 Subject: [Qemu-devel] [PATCH v3 19/20] docker: add special rule for deboostrapped images 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We might as well have a custom rule for this. For one thing the dependencies are different. As the primary dependency for docker-image-% could never be docker-image-debian-bootstrap we can drop that test in the main rule as well. Signed-off-by: Alex Bennée --- v3: - changed rule to docker-binfmt-image-debian-%: - leave executable in the main rule - rm stray whitespace fix --- tests/docker/Makefile.include | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8641f5da2c..fdc87b8a57 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -49,9 +49,6 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "CHECK", "$*") else docker-image-%: $(DOCKER_FILES_DIR)/%.docker - @if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; then \ - echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ - fi $(call quiet-command,\ $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ @@ -59,6 +56,26 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") + +# Special rule for debootstraped binfmt linux-user images +docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker + @if test -z "$(EXECUTABLE)"; then \ + echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ + fi + @if test -z "$(DEB_ARCH)"; then \ + echo WARNING: DEB_ARCH is not set, debootstrap may fail. 2>&1 ; \ + fi + @if test -z "$(DEB_TYPE)"; then \ + echo WARNING: DEB_TYPE is not set, debootstrap may fail. 2>&1 ; \ + fi + $(call quiet-command, \ + $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)") + endif # Enforce dependencies for composite images From patchwork Mon Jul 2 14:30:21 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: 140783 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp32525ljj; Mon, 2 Jul 2018 07:38:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcZViBcqAJYf50RItaNiK986ZZMMjcbv+WNN2lh41vOOiHMswIpl6Qb8gDmDSsTRgXNW4GP X-Received: by 2002:a0c:e345:: with SMTP id a5-v6mr16820652qvm.133.1530542335603; Mon, 02 Jul 2018 07:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542335; cv=none; d=google.com; s=arc-20160816; b=Htwj9pQJyVlNOmf+F+PdxX6engKNIhkM2J/M57HLMGJDUsnr4uq06Z3XDme7cOr5zV RKix/JPT+MUXEWjQvjTcTIJfbfTlTKAvWdCc+uxsNHwrmmR7ge1KFUMssZaBxIsiIvN5 Fr5cbzQTQdBwFZaP9lxuV0noRnZkz0EXqktflsbA0w/zXG0+njBqOV9y04a4aK+oD3En KPsKr6wnvCQLDtmyQDP/EGPNBpyGCv0rPJf9GKK1hGMVHbIcrWmFVMKzaTyLavaBcq+h rZs/JX36o4LV78cXz9PmUJvexeeYGn2aHXWeJE+DZwBGwYRvLpgErAiOHOCBHJlFtx98 nc5g== 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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=kuQalS118LJfyKkUf+CTCbvPkX+WeqIggvR85hre/Z4QyOeknMjpPoR0vdiMIrcv5g DMnp5xBKbpeE9J1GPd3Um/bIOI6CX258I+RU0vRzJZ5knK7gDEu1sloncUVdj+ENnzWu WxOPwiytc5ZnJzXGvZWRMjC60E/lE3kHER4A2ylOweaFrlpze0TTa6AqMVXnFPOpGwpA lwReUmgzcBNpQr1bqDKlKAll8Pw9CY4fBPxiRedC1EB8kkI9B5np+FsmzwSi9TxFhLUr 1GHdrRtl11dMrssKBTMjXwk2KvVVtQGLouwxlUcC1Z7dgpHsdxvlvhrQ7pnINnxhpqje cBQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eDN6O4bu; 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 s35-v6si4205057qta.330.2018.07.02.07.38.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:38:55 -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=eDN6O4bu; 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]:33180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzyh-0002ly-1F for patch@linaro.org; Mon, 02 Jul 2018 10:38:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqh-0005WM-EW for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqg-0000ZL-7h for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:39 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:43591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqg-0000YV-0L for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:38 -0400 Received: by mail-wr0-x243.google.com with SMTP id f18-v6so2067630wre.10 for ; Mon, 02 Jul 2018 07:30:37 -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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=eDN6O4bu3FMcTD/Of02QFh0OW9MVbDoar7OkbJrN2+sLb4cusoqEz5jW8NPWMjhXkO fYdx2kgY35Rc8L3mHyQhmRWvA/qYLi+OVNjpg7vFJNIVPd63a6Wh9Hq9Ey/tEaBcj2vo wfhF1AETS/FEaSnmVyIDNW8TOs/+LVyyMmroM= 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=SgBreGhL0rTgtWV9GmkJ558/SljFCMZ3OU+EpZwVNW4=; b=KYJEuMD4ShyA1BaNWn6YkQJonbWu4Rc+V7a0Ux316l9XoDdf8WYu8yudKDUnQQTi4K OcZwhyqPpN/0dnuFIEttAC7WzH3c4ZDuaRbJVTVUKXJCoTf3H2EQwYuZpijJT3MnEaPF o2A/xIZ3PVxe+fvv/9W4YopYM3hlmrl/zCNeQpp8sFDYyKGtdzYssA0l0fbtUn2XPVW7 DZGNlJfQ4i3iiKnAvAB23SGSqFSxW5v8p7M7z1oXKKWKdAT+WU+O+rKBr86snvwzNSvD cJV5jbggZilRpQRGo8eZhs7zFPDTG86HKew6utZq9Q3Y8FssQD7Ctp5OlIhGIui21TMj xbRw== X-Gm-Message-State: APt69E2HuNWlAetai6Rm+fJCZ7xMuJCYD8Sag9QE6JLF1jLH64Rqcc8+ rIkymtwmJU0WDBJY4YRDq9/VTQ== X-Received: by 2002:adf:b1d2:: with SMTP id r18-v6mr11162443wra.79.1530541836909; Mon, 02 Jul 2018 07:30:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13-v6sm8333280wri.72.2018.07.02.07.30.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 612453E0BB0; Mon, 2 Jul 2018 15:30:23 +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, 2 Jul 2018 15:30:21 +0100 Message-Id: <20180702143021.18864-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-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:400c:c0c::243 Subject: [Qemu-devel] [PATCH v3 20/20] docker: add linux-user powered cross builder for QEMU 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't use cross compilers in the current Debian stable and Debian sid is sketchy as hell. So for powerpc fall back to dog-fooding our own linux-user to do the build. As we can only build the base image with a suitably configured source tree we fall back to checking for it's existence when we can't build it from scratch. However this does mean you don't have to keep a static powerpc-linux-user in your active configuration just to update the cross build image. Signed-off-by: Alex Bennée --- v3 - fix for rename of docker-binfmt-image-debian-powerpc-user --- tests/docker/Makefile.include | 29 +++++++++++++++++++ .../debian-powerpc-user-cross.docker | 13 +++++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-powerpc-user-cross.docker -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fdc87b8a57..85801702dd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -119,6 +119,31 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# Rules for building linux-user powered images +# +# These are slower than using native cross compiler setups but can +# work around issues with poorly working multi-arch systems and broken +# packages. + +ifeq ($(filter ppc-linux-user,$(TARGET_LIST))$(CONFIG_STATIC),ppc-linux-usery) +# Jessie is the last supported release for powerpc, but multi-arch is +# broken so we need a qemu-linux-user for this target +docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc +docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie +docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc +DOCKER_USER_IMAGES += debian-powerpc-user +else +docker-binfmt-image-debian-powerpc-user: + $(call quiet-command, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-powerpc-user \ + $(DOCKER_FILES_DIR)/debian-bootstrap.docker, \ + "CHECK", "debian-powerpc-user exists") +endif + +# We build the QEMU compiler environment on top of the base image +docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user + + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ @@ -154,6 +179,10 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' +ifneq ($(DOCKER_USER_IMAGES),) + @echo 'Available linux-user images:' + @echo ' $(DOCKER_USER_IMAGES)' +endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker new file mode 100644 index 0000000000..eadb142792 --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -0,0 +1,13 @@ +# +# Docker powerpc cross-compiler target for QEMU +# +# We can't use current Debian stable cross-compilers to build powerpc +# as it has been dropped as a release architecture. Using Debian Sid +# is just far too sketchy a build environment. This leaves us the +# final option of using linux-user. This image is based of the +# debootstrapped qemu:debian-powerpc-user but doesn't need any extra +# magic once it is setup. +# +FROM qemu:debian-powerpc-user + +RUN apt-get update && apt-get build-dep -yy qemu