From patchwork Fri Jun 29 20:52: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: 140635 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1296445ljj; Fri, 29 Jun 2018 13:53:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdPZ0D600+oE+6844Y14Q8hrh7/mHswHbaGIdYNtLUPpeujfO+9Gq4RKV0nodBt7D3fGPwe X-Received: by 2002:ac8:42b:: with SMTP id v43-v6mr14465886qtg.319.1530305586466; Fri, 29 Jun 2018 13:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305586; cv=none; d=google.com; s=arc-20160816; b=JX7T1C7EpmeAcfsHpbXU4NHoGhxRfOSiOWqgq7zDpw5EEAdMto2cLFXnl5krFYyS1m /mQpw0JigaMN1nkgOiKbC8WebiVu0ooTKCWWFrhymRWRHDmygkq0iNcuBgbOXkm3EgcY lPAhL57ZVVHae0OZTwtAcD7nGBUxeUD6fhqgHqCJp4eFkyEPHzHPOQoHMa1wXu62qE/D 3fxJe1EJx7dSSgWJB+xAKuHGU48ZKRMS7hbyDTof/27a53S77WpYXn2+9iQO2th7l904 PRWXkQ7YDTZ1S3bQy2uF1szDdBq1h5gtggGjQH1KBhELEtsf3rvhCBdgxpHRYQzq3K3w M0/g== 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=VXG8rJ7J5qwSAlbOYw2mt/G/OeuCJgPa/20jew11HGIGJjbCjXmRFCSXlRjTYX3nAV 3SccRlAL8XNEdXS73QY0fr1OQ9bIy/0MbZmulOSaUw0NJXsMGpjiZArwmvkft/vY13Im cTFhC/yLqv9XLG8UFGfIqLSKINi6WSyXyl8rYAAPv1k3xpbER3tUgTcnlt0rtDADHkwC wpdy+ivkfEAIxO0ohjVAcfhSHsUEEPJfSj0/IcI3p2p0OWo5RlJ6TWaRznOrXTLoOa7m GSS7hvW1Ccb+GY6wLioGL8UKwoZFD+OHdBip4JrdZcprr3QuGKLB6wsRKSVav1PtaqPR VtcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TFuVuKp8; 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 s55-v6si715926qvc.259.2018.06.29.13.53.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:53:06 -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=TFuVuKp8; 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]:44409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0O9-00084B-PI for patch@linaro.org; Fri, 29 Jun 2018 16:53:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nk-00083k-B5 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nf-0006HW-M9 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:40 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:44004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nf-0006Fw-EI for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:35 -0400 Received: by mail-wr0-x231.google.com with SMTP id c5-v6so9972992wrs.10 for ; Fri, 29 Jun 2018 13:52: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=tpPmTCvTZ2FMs/GCk5dwQQ1eoPiONal16+9lLS7c4ME=; b=TFuVuKp82Ty8sNybiiF3Z1HSlpelbwaQKbhobJmbef4pBBTi2YjQt5zZhL4pUm2+WJ NYCuzs8oPbsAPno9vq/Q9KlzjP+JVrP00g5MrX4JOmDAwnVtWWtv9HUpU9SsnPGFvVxp X5tatXlxEZZ0c4dupBsWJUet/roLmNZooVw6g= 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=Ce7o0Qa4dr+sW7AqAfMaa9PQLSMhABwZjr5k6zSSkBdoE8sWVrluK2H02Dj//AeYcd DinUK+i9QoA1kcDP2KvrEVWYbGUnso2VZyVW3qygCm/E2vJ56zNeyMRKg9ASarbaTEgk lnDeNmtm3iG6bIXWFJuTJdeO6b6RqYTi1WtNq/AXFLQNNW0eyYifVILvxuFPsZW1RAJ9 f0vJ34YGVxQXPkDGQwDfQiozkOqvibdsYmpjZMHFq2GmccwqwSALcdBNTmF+M/BkKcOB wVc0AXIWTh2JF1ZoaDrNR/Md1wb+DwsTuQNhuIeRnq43bOuxTyQOzoz0rGCvkpWjlL2F as8g== X-Gm-Message-State: APt69E0T7Gs63CC9z0rAoGQsE7wDMkoPgPFbAQEUAnVnvcbhQYXffv0t vBTVWZ2D0Fv9dpPaXwt9n6D2Ag== X-Received: by 2002:adf:f9c5:: with SMTP id w5-v6mr1826190wrr.105.1530305554073; Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w3-v6sm13368554wrr.88.2018.06.29.13.52.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:33 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D7B313E0114; Fri, 29 Jun 2018 21:52:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:12 +0100 Message-Id: <20180629205232.27190-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::231 Subject: [Qemu-devel] [PATCH v2 01/21] 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 Fri Jun 29 20:52: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: 140636 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1297262ljj; Fri, 29 Jun 2018 13:54:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfrM2+0YsANhQCKpPUJ9HrXNrKjxbi+ZhkyrN/+agaNj6+CfMbH4sSSQ8C4QubCrSYV9LaR X-Received: by 2002:a37:9444:: with SMTP id w65-v6mr14260028qkd.268.1530305650134; Fri, 29 Jun 2018 13:54:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305650; cv=none; d=google.com; s=arc-20160816; b=GFl4vRXsteBjMeZC/aInjn5p5fxugcIFEvJ7SaMVyulezsXvPM9ahZjJzS4CV4z5nI 8jbXi3z/gmGtVcbxYIAthix7UX+Az41LXlaq/3fJjUXfhkqCFLAhCkqsx34WyPaCV6nu 7PQJExg3TDdKLppFuYmZGcFvKhjLqZ9ypdJ9A4HgNW40GXVq4KOLvRmXoWwd+j7uO722 hI9pkisUHAIdN4xSdaDe5pQuN37Bbakp10kyqGEqe6hKCaUu+/RHw+37VTLUi7A/5rVv 3qwyTFXxySzhmWzdBDn7wNc+8DUUWBNEBlV5VeoGU/38n8dn+RiCQvKSZId9exEWmwej vGag== 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=E/Iey7VkK73HCeVIkNpMYoOAZj7Jyiz2wuW75qFvurAqop3qEEjto9abmbAQ5/0b4f quOrjp2LG3G3VqGIKhc9SMVgMx5FgmIO2ouZgCBJHN9veWG03SqQLCgDCHBwBZ9BzbaN T/4g/3HY0wIC6d76B63GpTu8TBkmg9NUD6Rr2ftXEcdYBcrCNyIlMg2lt4OjSZC4/npY Jvm/bLcM1/m5HzGEKJgTgtyFCQJ95qk0+gWP3rNaUZ/plirVVlm6nnNIAl1Z9CABsV+Y GNNG1sOBhgafFfgv8MQS3ss+o+nVQ2xbGfFnVYxYjS8FR7qJHBu3+mXBu4tiFs9FthMh 9kfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KOvwOrMi; 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 22-v6si1307207qkm.51.2018.06.29.13.54.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:54: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=KOvwOrMi; 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]:44413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0PB-0000Y2-HW for patch@linaro.org; Fri, 29 Jun 2018 16:54:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nk-00083n-Iu for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nh-0006KU-By for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:40 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:35917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nh-0006J0-4E for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:37 -0400 Received: by mail-wr0-x22a.google.com with SMTP id f16-v6so9979666wrm.3 for ; Fri, 29 Jun 2018 13:52: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=aLRRfTifj+vCQZLLSS1uMRWJE+rR0Fr5BOQLcDcjU5Q=; b=KOvwOrMidaS5sKv6r+WtVPu4AuG5GT7luVWKiffKGLq75HbGVlvXkp/5Fe6HgQomHz 7tW7yvT96ff8UZzF6bbVevqYgG7PGj59NTJw0c249iyOu5Gmy3JwveG0j+8skDhI6MuH lgXvbE3UKoNv1q29FBnglapiQFNcTD8wORVcw= 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=RfBth3O9e6bum/7x9sbD65l3DAds6IiC50No61clQ2o0c8RG92vF/m02HdlnHMG5kf kvrzW3Ah5jDnb5yw5HbBpuvyGRXf28qoAeqK7BR4DWc7ykfuojWOJG4yLn2RPCRpH1YI nvFHYYSeVZOyqq0LUkCbVo1PfLODKl7aALu9o09G2uGnGF6b92zJ1PxmLH9+XB5triA3 +AlM4IBBAdwo1vWD1doizlFvPX5qhhkPfaFlRQZhpuxyVl1tAmfErEApa7tXUYcHKDuB Ani1dfDOD47R+CJHx/IByosfsRrpkx+CY5NLEgnmbqKhzjXE3yEWbtVNMHnEMhMJY93B TOOA== X-Gm-Message-State: APt69E3Npj8rmbtY5tT5CMe5uBz7I3FMls5UzZUjynNrHT3thyvUFqDT 93ZtA3GqSZp3wlRO8nsY/D2y0g== X-Received: by 2002:adf:a45d:: with SMTP id e29-v6mr13094659wra.121.1530305555955; Fri, 29 Jun 2018 13:52:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u15-v6sm4503059wma.37.2018.06.29.13.52.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EA5F53E0115; Fri, 29 Jun 2018 21:52:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:13 +0100 Message-Id: <20180629205232.27190-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::22a Subject: [Qemu-devel] [PATCH v2 02/21] 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 Fri Jun 29 20:52: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: 140640 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1298440ljj; Fri, 29 Jun 2018 13:55:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfaBnWbd3qf11htaLDCSZoyU+cmZXtz3at5L/hlQ54ggnCBUMp50Tw1JowohXAJR/YQ9lbh X-Received: by 2002:ac8:2f31:: with SMTP id j46-v6mr7936709qta.93.1530305753763; Fri, 29 Jun 2018 13:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305753; cv=none; d=google.com; s=arc-20160816; b=ZM9YRF1/jkcsmsrDAxr9+mrsdHwSeRmS3siBu3ekkThqiRwz8j1mQIxudeDU85eXPP gYzLck5MLihjvk+P4Au9LNqPHj2WCMi8md7pzkSrJpv5o34eDASG0yR6uEgbJi09V8w3 XvrxmAWlsgvVxP0l0eM6kHCyE2j884SwePWnza5t0kzGBadl0f3zjWXmfhyZX1CauLyG tLgRKH7dtcONOY9Bkf2ekjlEcSS9+04nyCpbmpugFtpsn0U8b2D78jry3ZJOh+pLWX7B f3KXJUpb1IfF4iIV52Jo4MEur0P2nlCJSWs4x8QSda+PQyVbWfSg8nsbkQurY94xb3vW EM5Q== 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=SaqBJE9JwWAeYUlCpH8Vpsa203EW/cTJCIXOIXx65KmCaKogWQNK9AdCzhFctgMeKa X7laYvHJg9ETq9nH8YEdULLPuTj5wTniaoSFqAi+AyuaOCSeROVsec2PMyLHZ1IYC3X7 FelQxydiU8L8WdC0mqfsfYNkEKkgPGu3tMceAes5ctVGCPBuSsG1vBacOhNmTFxlzD92 50zccy+RCFFslNHYlsLUYuGCnQXbDPuxIn7Ss6sOPGrgxc0DOxniQzQFcaJMDbjnYZWM /rfvAHsSLi90PfAsHMVYADQ95CF3eR/jFEtyu/BlNVluSQeaZxuj2M+Gz5zIU8hsDYpe mA5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OxWYGuwF; 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 a18-v6si1340773qtm.396.2018.06.29.13.55.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:55:53 -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=OxWYGuwF; 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]:44427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Qr-0002DB-6A for patch@linaro.org; Fri, 29 Jun 2018 16:55:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nk-00083m-Ig for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Ni-0006LT-6u for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:40 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:51028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Ni-0006KS-00 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:38 -0400 Received: by mail-wm0-x231.google.com with SMTP id v25-v6so2438475wmc.0 for ; Fri, 29 Jun 2018 13:52: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=5YJQD6mVsHQ+y4JfkIGsYKr2KX19OUMuNv1hJuaEJwQ=; b=OxWYGuwFPBELCoMU1pnOVNKETE0UgPy4uUe2atw+DBbhOA0pIYaVeRa5edk/yCj0NI //l/8gtSpJPdDxJQ+74Qa4KSM9D53XfsfpmgN5mcvf9l5bvqZL5NzkOtlvCn/uFcFjMd 9CB5nb2WAYRtSrrRgka6C5Hx95OzfxpGqK8j4= 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=FPXD79xmPJ3RqIqgK17TWrPZHtfBVg+XwEJreMPs2pUFC/WSU0/CsB/CYF6FAIDgis bnYFvMfv5tXSSLJ3lddnYmZlb3DzdSEukeD4HIznsw/kr9Q0EZlWJpbIjVhscFJyP7Tw FOY0ovnQ4bzKVRutp/uTeOWtneuTZqeXCQNZ9ZM1eNE8fU0pTfwqnrdOFCyS0EuI3tKE TpmpXP2lP6j7qABsBarint46Wkw9gr57XX9OQWHg9XS46edSrXYN2DURlMZw+XS02pdO x2IN69NZGL7xeVOukRq5RiyvyJhp/cYJeBDIJfBBQ0JJeOghqOwxx/rzlyeoaGp72nov fKCA== X-Gm-Message-State: APt69E1r0RuRJQDwSnoMqLVe6bzZU9+uCqakC0Wh/bVwD/ZDMI6hIfJh lDzPMnLAmTzbP6oDVsOiwo/5NA== X-Received: by 2002:a1c:5752:: with SMTP id l79-v6mr2596311wmb.103.1530305556741; Fri, 29 Jun 2018 13:52:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y18-v6sm12793200wrn.68.2018.06.29.13.52.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 09A2C3E01AC; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:14 +0100 Message-Id: <20180629205232.27190-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::231 Subject: [Qemu-devel] [PATCH v2 03/21] 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 Fri Jun 29 20:52: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: 140637 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1298112ljj; Fri, 29 Jun 2018 13:55:23 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfVMDkQzArwnrgnpehU14gfBzOJnJSo0QTnWZmmeQ6eBjB50mYq0NouG8DL9jV1K2FStdAh X-Received: by 2002:a37:f86:: with SMTP id 6-v6mr371922qkp.48.1530305723886; Fri, 29 Jun 2018 13:55:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305723; cv=none; d=google.com; s=arc-20160816; b=hhimIMQq6mDt3hBSUJn0DnhubfhzJ4PzRuzarhhbmMzEcrx+1ippjo4/BHUn+APpc9 Tm1WzKl5oBIK9N9r5J+OWE6oRFW+kbNkrYN+mJvBolirfwfOJaBKS9xQ2N3LylSvxh+N YVVwLwa55E/PRGOpy0IzTuuWHEB8aoQRG7qPQCRTZffq9kKuYrTRshebLxt5XFmeGvTy ebTJX+btoYh0LXaiOz04q5UFTQuIuucS5Y/JBJc2swf5ctvbS0POxiw+PxWkiQCy90Fe yEW4t56/2OmyQqwHkfcr7AKOp9No4QDiRckh3C/TD7VuWRHntLm4V8f9JzPPnyM136Q8 bjdQ== 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=edVFTpJE0hTirQ2Emyrzw8G0XMjdfR8+JhQTYtSBc3Q4YneTnAl9ZALqDR3h24cCxZ Ajidv4aqOoqMWHezGU4IQdbRxW87SeKkOea2fLn+PnyssGAqYvu4u8F9Nu7NAK9ZonV0 l6ChF1QXv2xnhekmsnWJsJWTgyh5ioBocmmwwDF5CAc/WCJpkwjGgNb0/iYgzLlUJPX6 4L/6Tc4XKj48YFptJ5xNeS6Pz2ATiLWBQk1nu3s3zAyq/QxmrEuy/euRkVR4bDcQW+rZ gfG2JZfDOYqklhItzT0mxH2C9eKBNP2QDhp98a9Cx/TOgFx324RqpceYMn3T4uw1w1Bx FnCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fRn/Hqk0"; 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 z202-v6si483818qka.185.2018.06.29.13.55.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:55:23 -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="fRn/Hqk0"; 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]:44415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0QM-0000pr-I0 for patch@linaro.org; Fri, 29 Jun 2018 16:55:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nk-00083o-Jn for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Ni-0006Mw-W4 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:40 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:37387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Ni-0006LK-O8 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:38 -0400 Received: by mail-wm0-x236.google.com with SMTP id n17-v6so3300424wmh.2 for ; Fri, 29 Jun 2018 13:52:38 -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=fRn/Hqk0ueasuZdF+svrbAjgGf27ky/UzmfFhVORgAXyMEXmuTfisTnlHKUL5obA0Y Q0P4TmFPVwzzKyqQomHTuxvh4s4VM0pdGVRVa62S6eUaUiKH8GsFuXspgvPu+6mO862A d/F7kdYd9QpzMLdw9eZvW+ZU9r/jQziTjBUr0= 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=PuCDzST2UG4+0Fn8VWaBD0YHr+xBxGcVvfZuDSh6LVBZ3IW0owQ0dodTY8O7S0sDkR kbzo++i0sCpjz8J90LCV3RSwYbmJBngytRc3Orq77hEqJaK/M1pxh3lzLPVnzUSxMlI+ 4FhfBrLWrW3KLC3q0jEEeG2KVY2ZkIVdge1bfo2XH3T+0OOKSI3y+y0qmKftipupBc8X 9PWIqDiX9oMr+yItkImZF4+mvB+Mk2x/7nf1iHlMai+Pft6/zqfs7I+tC+zuHLZZhlmW tSqsqM5s2jmOFZECP0NOabIxcI3alfw2iHgi2o0A0WNPTYExh4O70hrhanOBgzGcP9E9 SA+Q== X-Gm-Message-State: APt69E2RGEcyxzfuQNTfQNy3XF4xmCMjtyDvWZy8ajotgw0Q2IX8TLPo Fy12pK57TJD+n1RGFBWQoBmtPg== X-Received: by 2002:a1c:647:: with SMTP id 68-v6mr2923557wmg.82.1530305557585; Fri, 29 Jun 2018 13:52:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q70-v6sm4042491wmd.45.2018.06.29.13.52.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1C10B3E0284; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:15 +0100 Message-Id: <20180629205232.27190-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 04/21] .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 Fri Jun 29 20:52: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: 140639 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1298353ljj; Fri, 29 Jun 2018 13:55:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdiXzHyxLTITbJ4kxFrzC+kDvCUlNOPXTqm8llLBZ9iwhESQxMwgwCItqRE2Kvk3Bn1o8jz X-Received: by 2002:ac8:962:: with SMTP id z31-v6mr15438332qth.179.1530305746128; Fri, 29 Jun 2018 13:55:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305746; cv=none; d=google.com; s=arc-20160816; b=Chs06l2grpdXRMXlMNJ5rLiaOEaBYEhRDkTej44UAV056el+mYgx7rc7DYo3WKeLZN 3eGcQA0DVN4aL05MFd2t/7SXpiikq8aAXQmQowEy+AeEV0a/9Lomw9xZeB2KXqNq1ngF h3sAVWBT9hFpdHbEQK8FKwwQite67VAo4wt9NrvZQSQdiYTLjE0A4zpiE5AKDNJOX1TG R2c1z1WjWumLEMcHb4u8kraKagBGCF+CofehurudckCF6QiLj9JOzqUC8A0Q43O9gtW5 4QxVbKwE1kFb3KP0iO4MtW3nulnYtPyR40DXV3MxdINO1rdeYJwj2r7ypLIq9xqdMRrp +PqQ== 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=KBnxLK5gSAfDFjNS3lQAupJrEb5xefrqXlmJpGvjAAC84PJ1S+/+MwUxDS18StAnoq GLRVCFuXmh6/t32zLKp6GipuqA3cNMCQrVSt9IGM018JoodCyMoU2K4adPeyG1leb70D sD/zzuIdtkoAReCxeFXUXCksiicPscdsUCQAWE8Ml70toKIuKdn/gnM1sQsHKtSXTb5H HUk1goTWIM4PJFEwrA1xpdPpGoV+T/u/C4UCDCNdjIVRQtFzofDlnfhxFByd1gPH0Pqe 5VCzZRXIi1odVxrJ6mYTsrxLMUizDS+dhWPcCeyxy8tnbGOLmw5GdnNC1v7HvMqr0XsZ aKYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Xafp5OCT; 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 j97-v6si276094qtb.126.2018.06.29.13.55.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:55:46 -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=Xafp5OCT; 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]:44424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Qj-00029X-Gb for patch@linaro.org; Fri, 29 Jun 2018 16:55:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nl-00083p-6D for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nk-0006P5-9z for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:41 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:46913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nj-0006NL-Qa for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:39 -0400 Received: by mail-wr0-x22c.google.com with SMTP id s11-v6so746543wra.13 for ; Fri, 29 Jun 2018 13:52:39 -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=Xafp5OCT9Prh+n4lMnh8ksbaRf1Kwym2WLlpZodssiFFsHhKYHJFE80uxMBRRh3muW QRyclwyMPVouIzgVDzqPFxoRISiRA/brs68F6CC9SoalGotjW5mbh5G/kzss8vqYQv0A aye/AYS72b3kRtqLYuT7GtPOMPoszaul0O6A0= 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=BwY6DhdPQHASrk0JqE2wWFBMZ06kycb0mI9V5b3+QxwNeqJVLPx805JozOJVNZefpo wtkguru2z9C1ISr6UUnIk6/WxeizWXVMrwY4MwY+cgqhdT5L2K9xX1msyWPHeMw6yOwk tHyrRP5TiVzLHk6Fil14HlZJL94CuDp6lV9rw5EEy8abwn24WUOvClFo27dw/WLARDU5 2XiOQYWc4EI0qtGnp98amm6hs3kSMe5VvMlFykl92ZpjRM3pB8n+vwxUAj5/IKfPFozP rfkJDKwYcVT9uuZQs2byliRrD0EtWXmtzDXvUC04f6frImJQ3ReOsbY6AbDXA7Qp32M9 Oqwg== X-Gm-Message-State: APt69E0JcZYmzHFIM2o9OdgQ0ZUrDACH+bTvvNcNTYgYoXeZmwVd3dkM 6ei89t/vo0zB2QffS6iERI/ZJw== X-Received: by 2002:adf:edca:: with SMTP id v10-v6mr1991721wro.264.1530305558612; Fri, 29 Jun 2018 13:52:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i190-v6sm2925650wmd.33.2018.06.29.13.52.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2ECF33E0310; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:16 +0100 Message-Id: <20180629205232.27190-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::22c Subject: [Qemu-devel] [PATCH v2 05/21] 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 Fri Jun 29 20:52: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: 140645 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1302531ljj; Fri, 29 Jun 2018 14:00:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeQpzzWwnt5UHUB+iMeYLJ/QlGtwuMVQXWAX5Ba4pKpxuZSofMvvzVkEvVcSyQh5AlyrSDF X-Received: by 2002:a0c:886d:: with SMTP id 42-v6mr2165002qvm.242.1530306047778; Fri, 29 Jun 2018 14:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306047; cv=none; d=google.com; s=arc-20160816; b=ObqmLOcberjFOa+Y5NHKDfEr32SCdc6lCdcdV6bcp62XLxWKAm6tPVItZDETPfphX3 ginMvhauLo6h1iUTlxWgrz/Nz24kVMznKX+yXIQJj5BhiTyLLNYRS5W1tsh4f4I0wwMN JkmNMsskkvrmnJyixQX++qEaYK7R7/KDQKSXFYTVZKGGZ5fIaHs1CIYzCAtuyNhzeR5U tpewg/obZ0DIutb7qy2wamR16NGK+1UsXkZ9lXz0LHw+/vHTYVp+RIxbihVbT0R9bRnR kABqhqg8rthnBlDjweokaBzgJlWoy0NYsAFlhPKP8Mp/38ECrTQPahoedCcTmznU4b9I bdDg== 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=bRpbPm13lorLId8VksREIcnpDhBdJ4PsEKuVIqX5wv4=; b=SwtR2p0WgagrIcshxX/uU9/8JHe2VZVrvGkEsCSykYERJlsiMiUw4y74Q4OtYvEyMa wM2235BqwlrtFXv30BC15bvs+KiCYJ7Nni+Kg6GNqlx9zMtGWjEWRU0fFLX8Q5j/IYrD 9cYppLwi2LGX5lUvj7tK95mqW4o+feOx8gIzw9znMHdAA/2MCGYlJowAqNLwYr2tihE/ jW0nPcb0LFM13cVnypiFnFY9dmZM/ZYKeLW85dvRcwwobDPT2u1mWwaQYqj7WHecPMWa 1Y+5nf4jHowULdA8Id8AYszfeKz6IZyZmdR9zsdqZ9MeBoXEQb0OTCOU6zjn+HFBV3bI OI1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dGNacW6i; 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 m70-v6si3804171qkl.389.2018.06.29.14.00.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:00:47 -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=dGNacW6i; 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]:44447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Vb-0005qM-40 for patch@linaro.org; Fri, 29 Jun 2018 17:00:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nm-000846-02 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nk-0006QC-VB for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:42 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:38857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nk-0006Ol-Ox for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:40 -0400 Received: by mail-wm0-x233.google.com with SMTP id 69-v6so3270707wmf.3 for ; Fri, 29 Jun 2018 13:52:40 -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=bRpbPm13lorLId8VksREIcnpDhBdJ4PsEKuVIqX5wv4=; b=dGNacW6iPkZ0NfkklOjsYfIzq5hZ8dToKP841C9JwrZzuvd4UgC7WwfFX444xrrQd9 XtK1YiIaeh+t7JazZ1TDScsb+unfBplEU+C9i5fmIRMK/aP/ZQrykMDj3lolBLUI274l 5JYhpqEs/75cHpOQy56FEUCMfT+CDV3QggmMI= 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=bRpbPm13lorLId8VksREIcnpDhBdJ4PsEKuVIqX5wv4=; b=gKvjvzDcLlEQlcEz/F590jkn0xYlG/HLnMm7pg5StkK9TnkwboalhPaLo3cua7GIka lanl8PwmSNwi5Z6ANYJQuZQw8RitoF9yCyYWt8GH3snu72oLC2siyEUM7LICnRwJiNew 0kvaoSZZDINEW9HXtfYWV33zkFL5LnNauZMlDbBoBF6rphswMjB37W4/+zjWvws7XeLq ZiA3jEtkvgNqqTk7fzDP6dYkqpp8t8WAuICXv58mar+dGqC5s/nURROmC1XDZWz1IDaX ty9DDFNab4pOCiXpNKKgPSv9+fGpGc88q8GRWTZr6uUOQyzRlh5CSt91zN3ywDlZA+a8 lpgQ== X-Gm-Message-State: APt69E1rv+7MeLV0DOFSTTGz4RzzmfgkKUX2wGbIpEAOYDh42221ozxW nkFDvAKYDtlgjrMf6E0WuXLuBw== X-Received: by 2002:a1c:7f95:: with SMTP id a143-v6mr2645930wmd.108.1530305559577; Fri, 29 Jun 2018 13:52:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j7-v6sm4741591wrn.96.2018.06.29.13.52.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4265C3E0317; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:17 +0100 Message-Id: <20180629205232.27190-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::233 Subject: [Qemu-devel] [PATCH v2 06/21] 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 --- .travis.yml | 3 +++ scripts/coverage-summary.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 scripts/coverage-summary.sh -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 32188d51f1..aa850c913c 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/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/scripts/coverage-summary.sh b/scripts/coverage-summary.sh new file mode 100755 index 0000000000..d7086cf9ca --- /dev/null +++ b/scripts/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 Fri Jun 29 20:52: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: 140642 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1300127ljj; Fri, 29 Jun 2018 13:58:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfKk60pOCaeGSLG/uRT3eSx89YSucJXBFWouJ5IPKeiqqqT5a0aMWVITRzZNLkLXrzE5Z4v X-Received: by 2002:a37:7141:: with SMTP id m62-v6mr14138036qkc.110.1530305889609; Fri, 29 Jun 2018 13:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305889; cv=none; d=google.com; s=arc-20160816; b=SE8jFhUnZMKdg9qrvh1jbeCdCaSB4q1Gr1FYCjaRFDsWmGuljZDfKnkmpiUPb/0LbI kE9Aln4O4lLjv6CmWNOWdkMH7EWwMbp2qVcJPco9vuJmir6CJ9lsC6e0DPr1qfDcvB0Z C4q8JCSukLqgSzcsRWI1gDf31vE911B9qSR1diLsSt+UpkprgP3U1MzbxAF6dzy+oyeC kyrxLB8JXKdx16POOR6a8sPxfrWy87K+ZZL8Lgjt5WfA4B3FDacqE2ocCLJHl6suQxhj z0+L93Ad5G84nshBxcayZ9/AMfo0jFEJmyXAh5siWVZEZxSB/tgNdPLdMzZxOxCRQqJR Fx9Q== 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=cDN9adCyJowdFohRcwb6OscdGHS6Lvw2oV/aTrv237IMgdZaHlieWtYascyHovV+zU oZJ8gQP1mgAzCLDPVSr1iZLb4lrXO3+kkzNEkGOSZLiVX37g9xJeTeAR8NT1xjsK6h2t OyvXFx6Z0MVAdsa9BqYXuoKdxaLUpefGz1Hkd0DQLRMpxji5NY7KnQzDdujVorFhx39M HyOJ6FVJZYid0HDXgbcose2BNHZuMARstuqEK/iiaSVoHWb0AWnoUDH+K04E5BBrv2en 1CJD6bqJ0lGPNiHamg2xLsgFOCOXO1k8wlBlKNb5WChRgkApQOgtNwntpap8bSFe+Crc pl0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hGEHNO+7; 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 33-v6si840378qtg.224.2018.06.29.13.58.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:58: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=hGEHNO+7; 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]:44432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0T3-0003Qm-2Y for patch@linaro.org; Fri, 29 Jun 2018 16:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0No-00085Y-7r for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nn-0006TD-BR for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:44 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nn-0006S7-3k for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:43 -0400 Received: by mail-wr0-x241.google.com with SMTP id u7-v6so9978102wrn.12 for ; Fri, 29 Jun 2018 13:52:42 -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=hGEHNO+7yyCeGiKaRYy7cPJiNu0zMjPaQ0yJbNG6L0Tp8wCdAJbn/j0fhpUybrD3F1 PvmUWeLpBLhwRJTt1gLm2d69Bbdj40aznH05D6V/Md8uMN/9F7g5sjqZFYZiYY7kwtYq pgot8vCxM5+eTeiWf2QenB1lA2WD5BWRkBN9w= 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=qbJIoHuEzUuX10sQ1QOcm84duqYqOF9lygu1BMta3vjxC84Df0S1kzap1xz8xlKx8x XvNDCJodOnB14+dzqrWmp1SdBDHpIoPuuHuxD08qt0kAP1rd4diZdMbv61NaCOHzYWCN 4+CSJrYkulbnnoYkxB2O+SbOZLKt25tTDBbMbDoDCetE9ft+vH+uy0DnjK8nBlCpAW7F P83g39SIuV5OuzhxuGfZFAOjt1XeFFWW/uiOUQ7hPZhOA0OgEB7Kx9tVcSI+FkM0RDkI HVkgwlwuT7WYRBX7pYCT9hICQKE+85gUMU7lcKWF5eXAUeSGy8jgrFsdpVN3uTvzLcyN +98A== X-Gm-Message-State: APt69E3pnA3vrLsueTZS/Y6Bf08AfwCV22uXZmwpl6u9G2QBdkvVEdAc c5OcdAy74JOyycoGKit+bkhxrQ== X-Received: by 2002:adf:adae:: with SMTP id w43-v6mr13927625wrc.251.1530305561934; Fri, 29 Jun 2018 13:52:41 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r123-v6sm3561960wmb.21.2018.06.29.13.52.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:39 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 55BF73E0719; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:18 +0100 Message-Id: <20180629205232.27190-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 07/21] 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 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 Fri Jun 29 20:52: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: 140643 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1300486ljj; Fri, 29 Jun 2018 13:58:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeSFKF2FGPDElU+YrOTxM66V++Y2C2iZPZcWTRWW3JJ5phoMuTXi80M2FMTDIip+s6fjlZm X-Received: by 2002:ae9:e848:: with SMTP id a69-v6mr14622217qkg.161.1530305918360; Fri, 29 Jun 2018 13:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305918; cv=none; d=google.com; s=arc-20160816; b=DO31oTtLRIBjIStmig07rK/Gr1diFcoXX2JEbgYSZx334SO3XuSramTCUSMwtVSCWj uMmCDBF/PU/3wznZxIBAtGdwzopgijkfVewvhTq2OcO/wxqjhkKu3/tCYkyf/q0QaT6w EwQOSUf0ZZ/+Rixdj6EwSngN9MO/BKiuQjyhIRs11OebV46b7iq/cXzQeKwsrbh07VOW hovEgaMp88GRw+XpkNGS2NWoH2l7dFfeIKPr9+hAGM4mEVTS/GPtDD9TBm0spaF59aVg P8J35nAmsfRuHylU/ttyN9EowCFF6Rk7q64vevswYjpOgcodJK5g467DHsglXDAK+drO MvLg== 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=Xe9XLbYaz14CA8MB8/1tf6524o653GvEdUjwrt1Ja+gLyB8RlI2tLA1QN8tu5mLdkb 6+1T0pU6I94/8pqtKJu2s72NfJ3bX8/Ujp8A/VKesyTSNoNQyJGTbHx7Lrol9nZpY7iG +Pf8Yd6ekJ0kM75GyisSN1xsI321TZ647HnrX7N0ksOzfVLKFNrus1fs76/ppjqPrNHT q8zlpQ0zft9U8e+kVlHiiDDlZeuUrNCGWQqOC2O9tA84+8MD7GiK+YLe/5K5mYUtzk+G Hxe4urf/+G5au7drYFUpvIriEP4fVBYWEtSk/5d3VztRCotAtyyJa1V7r8lq7Ma/ELhy /jzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gWMPi/8x"; 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 z202-v6si489306qka.185.2018.06.29.13.58.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:58:38 -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="gWMPi/8x"; 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]:44439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0TV-0004dw-Q9 for patch@linaro.org; Fri, 29 Jun 2018 16:58:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Np-00086n-3z for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0No-0006UG-43 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:45 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:39594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nn-0006T5-Ti for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:44 -0400 Received: by mail-wm0-x241.google.com with SMTP id p11-v6so3271278wmc.4 for ; Fri, 29 Jun 2018 13:52:43 -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=gWMPi/8xiCKnKzbX35ncEd3ZgDBs0o4Uiq/QmdZXOfumv+/ZA27eK0rLuO0IWbLKRT 8AE/GqPPZxEDfhWrMcrHBBOEeQmLIFkj/+dNoHJ9Wh3629pSx0+NgvySLOiCe56xBZPE XRSulruCI2+r2pG/GMcXpm3LyXewsEz3hUHgE= 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=YFYBdizvgrDwJfaAImgthjumtGLFGpTvV2b5+BgDl+rDN+nh9XsZNRLWFPWX1KFxEH JUISpaN8+a+8H8YhNGqu1J1WzoO/iwd49exbtDtDM1Z9sfXLc2FXiQPBvdT7E4EKN1Uj lQpk6KTSCAJ+It6/xQj4tMHBqli6LLX+Qo78wN6AH3koNy7wBrR4F4rrEX49gGuzrvf4 lPBOQLSHDC3eFwDjX/uIFM9YXnXK1tocNzAqqOyZgchLSIerIz43SlcmX/IWxcwcsu4K x1OlBHPhPNFyu2CbECViJh/POO7kx+k+1lr67YoJQzY7+vz3Dd25WSK7TEnhm+PKnn6A 0zmg== X-Gm-Message-State: APt69E0BFGKWNiq53hCN4Sl0u2LyWjDS5PbZD0uUT3hIIhL4jiP9PkLO 3yVu6r1kXqrHla5O6QSZh177PA== X-Received: by 2002:a1c:d7c3:: with SMTP id o186-v6mr2666411wmg.67.1530305562699; Fri, 29 Jun 2018 13:52:42 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m58-v6sm19985884wrf.61.2018.06.29.13.52.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:39 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 69D023E072E; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:19 +0100 Message-Id: <20180629205232.27190-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::241 Subject: [Qemu-devel] [PATCH v2 08/21] 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 Fri Jun 29 20:52: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: 140647 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1304935ljj; Fri, 29 Jun 2018 14:02:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpesKI25j9rAsSM/0eBOV/mVr+pBqn6YB4S6o9w4pQhW+KHX8lk0Ms++fpcl0IL9ZIGh1lvy X-Received: by 2002:ac8:8d3:: with SMTP id y19-v6mr12838389qth.112.1530306155901; Fri, 29 Jun 2018 14:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306155; cv=none; d=google.com; s=arc-20160816; b=QelhtvIbbpNMTH2roMtjFDIDaB91NzKujbNfJlzKSOjEGw1WHmvjzo0vSs/bBocjty fLz4Pmou0BQzeQUqxehEDSeUacG4THRWIlU7NHubJlk+T07JgTC0M+RG1eL9puqAFnSh YJYLFe1YZPtl1Tvv3ZgSwgfi/BLanxRWrYCIIsxpSyZyoao/MuiSQtnFzugYwp6uwftB HIFkmcXNbILKTjRoBxTrzuo3SSmrRLg2Ior0poL9LFqHy38C8tMTkNzp9zc0zWiHYRie /SMLmP3xm7U9FJsLliANpc88VJsYf/5OdsNp5b5Md3BjLNCpqLvz+1jqF29SmrNNwHMr YCzg== 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=eLoKplgI73EdfFa85kbq7gWZtoZO/sFSmBs3FGLAntWSc+fBH3If6vsmPA3tSkMde7 Xgkq6t8OcfjkbT154D9lN+VAciN8UuGz/wyGxrP8c2NHstFOVtkjcCkefYxWrHAqYQ9r 0FWQPjEvbuTZ5Kk/F6cDhu2jPCMWlsGTISffWzHAhkI0wbdHeIQAQ3kqh2V9914ty4tO Do4H4TIky7oN3KUvRqIZT0kfXGU9X6cxkVns0hDe2jFcPVI0QPHSdRXTegAjJvZAudYk lt3U00aXZjr2yq2M1iRAIWIKCoUjwm0yWanU1QSb5KL6USh3YEINcEPVpNeOol7LK2kN E5gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ZShci/lq"; 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 u23-v6si3621610qki.144.2018.06.29.14.02.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:02: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="ZShci/lq"; 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]:44468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0XL-0001UC-9s for patch@linaro.org; Fri, 29 Jun 2018 17:02:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nv-0008Cu-6m for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nr-0006Yy-8U for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:37482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nr-0006Xv-1h for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:47 -0400 Received: by mail-wr0-x242.google.com with SMTP id k6-v6so9981879wrp.4 for ; Fri, 29 Jun 2018 13:52:46 -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=ZShci/lqTs1MaCgIC4tJ3wwKDPGRXD1e5cZYoFOrCZz5dhvQyH4R6lif7D1i4GG6Uh K1fvpc9dSNihS3kEPGZIqUUrnuzt2kUVlPd+Msab6glIa+7ltkFA/najlDJ3iym0CpcO fy0ZQOSjS5ZVaUFbURxdKKIonwpPeXXv3l2HI= 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=UKk+Wao+eTudtpkpx46ZdxuJ+R3anu/NZ4Gq5S/Md3fgoRo8NicHiRsKikVUs6vurF 8b/4rJVzCN1njaXDXutQr25GI7Qh7SLwPCxWqbqz2tqyXSmm1+2hFjRIcaHrPmJmiBPe tmmjNl5uAZo9jUey2kgBtKx0Bj1mvRsH9gF8yIMrr/KXE6EU2qmxnHjRCyloTenr3YJE dD9NVQ1XxlL/dIPJdF9FRPUWJTcClO0WKaUgwK8bwDVzRwc1Qworu4VWjyC24iJ+ov4E TE+4dsZtK/ulG05rOjlS1dqQ7NgVz+wE1J3NmOSP+Jz4mIl9Be7xCY6yeHqgHqd7X1rs EVOg== X-Gm-Message-State: APt69E2XY9ps01xpvny0aEMNsiZ0GEmvLskeyGRsrZdnTPJhbHle+Jvg yfdynJ7QGgRmVUtQ+hq7zhLlQg== X-Received: by 2002:adf:f002:: with SMTP id j2-v6mr3880118wro.260.1530305565840; Fri, 29 Jun 2018 13:52:45 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a17-v6sm7419253wrr.81.2018.06.29.13.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7F79B3E075D; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:20 +0100 Message-Id: <20180629205232.27190-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 09/21] 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 Fri Jun 29 20:52: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: 140648 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1306430ljj; Fri, 29 Jun 2018 14:03:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe6EwXjbI4Iz2G/GNx+2pgh4T4CeElZlN8mjB3Vm0eSk67OhMhW+yquLjhpYijBMRZPdSYU X-Received: by 2002:a0c:dd86:: with SMTP id v6-v6mr4853188qvk.148.1530306227412; Fri, 29 Jun 2018 14:03:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306227; cv=none; d=google.com; s=arc-20160816; b=Y2szqDpVfY1ktbrKzLh2T/oJ/aDPoGRfkd7M+JcGV1VWl67XRb++IPnz/p5jxRwn4F VAHEx+mvDxWqXX5+XGjiUAtVwqwO60XEciDr9g2YWh+L99HZ/2l66Ta/kB6m3QE/evjp DEt63LkwXSkFZXbIw/w7uWi27KxwM5/Rb5vSV7q5NVzb4hojnpmOaXIMdFvbvX8aiGTV kr0oGZ0myVA4yltWs3ELJ3s2aPFbUIQGa4R502jKE+afGj1Tb8RwrZOiMUIX8uHE9xas FfhtRe/rE9bO01GJPcYUKtH/6OG+tflX7eZOQigupqH8mztJVab3GaiQ/CQZL6G2mTiW OjHg== 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=dssCHsjdLR02Nsl46DgFNW8BLQnlhc6ADTeRj6CM6Hv3pJRGB60BCPxOwjCvbcStf4 9QigFqt34sX1n1JDTpy3YCY5ia67IhjoC568jm3eA0I7TWTX5qh2j2pr8g54zmfZLVEz j2wx2aFddwAZCINqnKqN3lC2Rw9eQmK3+GD/V7ZoOl6ydEYaTlPR7e6Z9YjpLvU2mFlk vxU0LxkFfCUmIUtybgXcfi1wm3XIwrQ40IaGZuxhZ1q6ZwQ7+vVu88T0GVz/xPniNfGI D+/DBtvaNOGnF++8JIMtQiz5RwQuvQs9GbM69AbsPCI7zjS/7ADjd2V7yPGrI/tP8naV OR7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UagC+5xd; 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 42-v6si610042qvf.139.2018.06.29.14.03.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:03:47 -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=UagC+5xd; 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]:44469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0YU-0001e7-SB for patch@linaro.org; Fri, 29 Jun 2018 17:03:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nu-0008CX-To for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nq-0006Xc-6a for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:50 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:34176) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Np-0006W2-VR for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:46 -0400 Received: by mail-wm0-x232.google.com with SMTP id l15-v6so2882227wmc.1 for ; Fri, 29 Jun 2018 13:52:45 -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=UagC+5xdBZYa2vRVYjlM50Pv53s48HsyCUbOMOFWOmsuAMvGatnmZQh5e0VrJfX/Nb 2NDzWAoAmx71CDO2CXL7HS8LqNULR367hBzqE3IcbebO3jwLQ0N3dV85UCZBLyDoK53O leJPn+L1DiTMed0sUIAAs/+FaNcMDAxewZCIk= 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=eqn52+od1Sx0vSIRYdQqalA/n923iGBbtJXWy9HQEACadfnlmnM2aUKauN7xuvY9cP wm6RAz0iZjmPvmKM/2xZ1HG3QYT4CNYdawgYy3KK779gtxo3BcxKjMwV5NM90glTtqbb TbGy6Xptp/eEOQ/Dpzwpj3TO2pkXRZ2HAtFFNJhpk9XvIT+lyr1yKBFtZDPAcTViLinZ IiY9bWeVgCUgaq2i72J2podLe5SGDO7/04/B5QWLxjHPns+02TyHtgSnX4I6PIXNwasr WcLXTIiIYmCJaBBjk/5Gu0Z+0VV7krsleFnKCBOcN72MXDxsq8p6lVqckdrP5DaMvKJF dtxw== X-Gm-Message-State: APt69E2ATdnqLwHRvV3S9WNX0McM184CssPTmHrTXTTfIoN8CX/cMT2F ZZtaeEeG06v3mnfFYLa1JdiF/A== X-Received: by 2002:a1c:17d4:: with SMTP id 203-v6mr2675549wmx.75.1530305564818; Fri, 29 Jun 2018 13:52:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r7-v6sm3966187wrn.83.2018.06.29.13.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 930473E07B9; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:21 +0100 Message-Id: <20180629205232.27190-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 10/21] 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 Fri Jun 29 20:52:22 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: 140641 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1299191ljj; Fri, 29 Jun 2018 13:56:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcapzPNuePA/ac0Ojp48O31J1A9Bm6FYIPn49Rc0Xj/PCC7xgD4Z1CSvmWsKdu48JW1V4/H X-Received: by 2002:a0c:9b93:: with SMTP id o19-v6mr14874132qve.89.1530305813736; Fri, 29 Jun 2018 13:56:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305813; cv=none; d=google.com; s=arc-20160816; b=B1uvRTlil0KmwNBQTzpVT2z9LGbjYWsqXnOglSqUu+rdRBUEFoUh/5z+pe2TOfjQQx O86kUJoERi8r4Dxo0CD0ofmuyIo907hsvvtjOH/pl+KOpjeJkSQEPZuYMyY+O8dIqAFn HUVjB6DxwahZCkKW0I7Z0egmR+4+Wj+L82mLERfjDeK5BtIBCw9rnInsER+AbA+rv1Vh O8060/7VpMHNP7qFU7MkTFkNCWe56Xeye/D+bH31HkJKt3JvhZlUiwSfDO71gSh/Oc2E QQDV3Gd9mOGbhdH1k8PNkgahpyQtYccHY/AVbZQiriXcOkQIbSPs8gauFWoggNEq6+cX n1UQ== 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=Xykk8aL8um062tbvnJ2Dl2B9J6GaaazaNx83dBjJarTleEPKxgvqk57DPr86m49eO4 SPCG5bXRiybq0nGGgz+uj7mChv6cmEX6ixjFMNSvbL+fq0rIoaFslCnksxDF6QO2RllM UW76G0vb3LXYaylH3sJjodP6MT2qo/3fo+tRV6U/1e1WE6Ft+nAXw6ywt4KSUMiTnV91 25Mck6V9z586UuzRUoWaAMvFuWKGpPtVsL8nE71+KLMvLANlWnw5c7JZtNNX0gChBvgM HC30wWSezDn15ZS1IXYixeOEPaOgfnrOzapH9BH67fdXhR4B8zxLDKzyjGGBFrIcWxDT Lf1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ei/P/WFy"; 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 10-v6si4233081qtd.284.2018.06.29.13.56.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:56:53 -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="ei/P/WFy"; 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]:44430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Rp-0003Bc-6f for patch@linaro.org; Fri, 29 Jun 2018 16:56:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nq-00088D-75 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Np-0006VZ-6j for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:46 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38850) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0No-0006Ud-W6 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:45 -0400 Received: by mail-wm0-x22b.google.com with SMTP id 69-v6so3270824wmf.3 for ; Fri, 29 Jun 2018 13:52:44 -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=ei/P/WFyn/JN/Xl/DVXZ0jRILddmpl82Qz/J0SrjH1fkq+biCCxmQhElABtfKE8BDl 3fs6m/ffj4l1PlRga5E9GbA3Ees++oi59n2oMZ1UDQr3Tz29XmssgL/bWvKLXz52AKa1 yCCzZX6sPuIldyOvxnapww2jUTdhMXcw9se3w= 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=o8wppsMVBRMA31fRjceHHEuDi7ujgqmrBDJZNUtwKqWN1iGM31ApHdBDMAaMOQV4Fx bA+bEVk2Uaw3YaS+IOxGnxUA4QleMRjdHjAvdkx/56ZzCMkx9+jh85NKzcl3+kQuYZUE t6roI19Ip6Z0z9wCsKA8MIKiiMzf8W3UbbdH0XXY8Q09oBFOfVm9AaqtYDs+mBV8JVWM Zr+TKtEHI7V2qrrUDOPcoUVDgyvYkjVetPcwozyp5Tz/YuyyrmDOuY8saOMD4ZpB20mj AXJOs8Q7p5gxRiDuQ5I8VkoYx15/sY9NOAYY7sgZUz9ud9IpXIGzVSmAp8Ng2RbX/NFA TrIw== X-Gm-Message-State: APt69E3A6wtgLyGWvvktw2bHzhjUwTNeCMpdc6mTsh/k1iysSSRMh8II fbJZPFEFRlbVMxBRgAYwarpwTA== X-Received: by 2002:a1c:647:: with SMTP id 68-v6mr2923717wmg.82.1530305563811; Fri, 29 Jun 2018 13:52:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h1-v6sm12172160wri.90.2018.06.29.13.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A623D3E07D1; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:22 +0100 Message-Id: <20180629205232.27190-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::22b Subject: [Qemu-devel] [PATCH v2 11/21] 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 Fri Jun 29 20:52:23 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: 140646 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1304297ljj; Fri, 29 Jun 2018 14:02:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd/ZVDDqnqgY71KqRwSifQpTm28BAnDtaFRkOxKcvX6ovDsR3DagROt8m65knrLoZ5VJa5E X-Received: by 2002:a0c:b620:: with SMTP id f32-v6mr14831193qve.3.1530306124619; Fri, 29 Jun 2018 14:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306124; cv=none; d=google.com; s=arc-20160816; b=SclG4r2ujv4wxTNlYE1nYUQO8/BrV+FYP2SrcJNUvlPrDLUEK2PYUBRuOkW9rpWExP XoF2Xu2aRsA04UP0QxD6D4cm58d6KRtzHoWwpnJkYE1vIWMfZ8Haug6Ovo+GRLh1QOSR u5gTXRmYr6LW3VKPwpGS0tJYtcAgM2YWAh+loopYx8EIk6VYoLz4DPIVk3l0r8jVyVH9 xMNvwmtSwFEw/FmVuFqHz3+ROIgT9t34KXqJsJ0Rysn3fsoTD/opJcRGxEgpmzZOX3vz GVd9AypzED8Oz3Hti9r+hx2MaRbaXtRfdyrijCaqZ2T5v2E3x1Tlr7rSoXXPNCy4x/ob mZYw== 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=z+Rgz2e+2WH5fMCJexJDgzWarr5CPBl6mbNZ1acloieLM7rSdyS0FnSvu/jw1aaAdu zercAME7HaJhy7m5IJNDmB6RL8zzESqKKFaQ2JHR7jHyZJw5GgiYOtlyCZZTcGesyIoN oDYUZaK9ZFuODaDxr5FrcNeTvuBl/VNgzC3o4kIA7tOKUOS4DHSpujCxXfCBwivRq1WM Q0/HZNysG2fkWVzty0alRJCSwO+zAeOnKCEJfDA/UlOxL/G+D1lZrr5ZxaGk0Ljg6tTy oA3Q2rqpcL/hhWqfXuBnsamtTIL8L/DmneCIXEt1az8/L83zTMYGWpsI5A7FN3GabiAl v8Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OFIDy4DQ; 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 j16-v6si9810961qvc.33.2018.06.29.14.02.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:02:04 -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=OFIDy4DQ; 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]:44455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Wq-0008Mf-3a for patch@linaro.org; Fri, 29 Jun 2018 17:02:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nv-0008Cv-6y for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Ns-0006Zz-9k for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:36077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Ns-0006ZD-2i for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:48 -0400 Received: by mail-wm0-x232.google.com with SMTP id u18-v6so3306745wmc.1 for ; Fri, 29 Jun 2018 13:52:47 -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=OFIDy4DQ5V05TcY3qpahg/tWvckzsMWIU4tx0aZrBAYeAMd9AjFRwdi0uQv/1tQ4sD GBFlvdsQdtqIDv+H0mQ2eli6kSIIYDIEbB5pq+IFzIp1vOFsd/qwvUQkeIqMdP6lOYUV oc8hOhmHpsAKDg4Q2x1fIo74w2POKJ7Cn1Yjc= 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=KEsXVJX8Pvv3MRYnHbT7i6FrvLcomA4KDfhZDOHJ4OBRNc2QMDzcOm0NP2iAIIEGnz pFXBynQzD8d/evhBCieId5gI8oLv68fPq6jb+90CXTNarOco3iuIzXwiRl/e9CDwosA7 bxWaW+ZczCXXkVy1MbSQL6dxQI1MOul2uRSi7dA4fK7X6K+XdBNpzEsyNr7W6eJaWWXb bEjEKoD2CE7iZyDfVGZ0oYz2vqSEZSUhN8qkUFVM0vHsQhksBJGCv/1UGtNg6oYoIOLw K/GryrERxgrNdQPo/jMCpTxg3pw2ejFqrAeAVM2a2ZEi0ne8hUDRvHhNXMnBl4B06Oc5 Io4Q== X-Gm-Message-State: APt69E00qfyvn/ePZYs4yg0DO0mr5L4RGkDeEtI24jfcKzjAgZLC0BiR 9osxvBBSySXJK4WhWeN8TNHFhA== X-Received: by 2002:a1c:96d3:: with SMTP id y202-v6mr2727995wmd.76.1530305566907; Fri, 29 Jun 2018 13:52:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u4-v6sm8696339wro.12.2018.06.29.13.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B9B653E0930; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:23 +0100 Message-Id: <20180629205232.27190-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 12/21] 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 Fri Jun 29 20:52:24 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: 140654 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1310450ljj; Fri, 29 Jun 2018 14:08:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe05RDGnfoDOVEA5WFi1Vlp8+2O8e+eEpN8UnISQLdv2hseq7+WMgekKCm6ACoH2H2RKroo X-Received: by 2002:a0c:8564:: with SMTP id n91-v6mr14696494qva.13.1530306486072; Fri, 29 Jun 2018 14:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306486; cv=none; d=google.com; s=arc-20160816; b=jrX6V02/KbU2GbC77avD42dVHO3y7gDoQW8NJYm2wi9qVgbETeB3wrAiodBqjHN1CT iw9A56VbXW2cjx94c7gDUjlSzCfjyiPD05S6maGCSSFjXwi6ZIQH22Fgr7HddjiTr8/T EttSLyloghxqNR7FSM1CTUSPMfeolLFtEkxEpXWoo3gOwmcVSaSom6nfWEedDh+Pab5i ZVzvH6TX1/sIzExgIz/po3LWHN79K3a5DL5kmBYSw0IzUnNWUyb+7TwhbsPUt92S3ovJ CUC++5eZVvxrl+aHrupeoM06+/ZA7JJZtwwLq2kUCVlqSn/d9Qaf6Ro52A8WCqAjvKfr s8+Q== 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=nPLd92uAnBPLtzH8xEwDRSsSFEy3EJqVLzbsK8pYZVc2eE32LxE1tw8A38Z7nqnn6G SjxnIWKPbgZdsdj1+6uaNWcY7vCQDK2qhygU2Xp52RqEhFIv3UNMbEwQ8ttEz18ia+Qh 0kQ44qENU1DEbz+chB/ISSonaTDE9OlXsGPkttrVSkEcESQDWewe5EESswWfk9wIYdto RMlPRHUJV1ugunZL3eRJ6yGpUAL2tFpMpM+FPvQjoGVuyfwOGTrKVVDNVcwzBuYrifOU vGCxG0pVGx3Hgl96nCPEApNXnOCTPvvw4TSvu5yhnvLZHO083ST7skv55oWcVCCCQyw0 Kqyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AnzPlM2t; 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 p47-v6si4168667qtp.296.2018.06.29.14.08.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:08:06 -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=AnzPlM2t; 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]:44500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0cf-0006i1-HD for patch@linaro.org; Fri, 29 Jun 2018 17:08:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nv-0008Cw-7F for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nt-0006bR-IP for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:51478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nt-0006aP-BT for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:49 -0400 Received: by mail-wm0-x230.google.com with SMTP id w137-v6so3430892wmw.1 for ; Fri, 29 Jun 2018 13:52:49 -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=AnzPlM2tx9Wih/ixQ3Bf+YsnVX211AOvYTlikCu9LBfZJBK9XULW4dQbdPcVR369Wx T7M3dkUXvmBFx9kcewB82po5rnXvIIpRV4ql9cHzriBaoOqKkzcAXwGkq1CKzGJHbCUT XL9LXnOgTYPEwSa8AGOVcUKbxYkLyMG83hVXQ= 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=RbyoHo9+TCLlq7XG9UYPDYVnucJ3nAN5FY3oPdU4+WmniMI2oj3BMjx0oYNZBewz5w rGyrA5yPjZ8a9SK8FXgVoGDrZs2uYkIJslZpFhGlyFl5BbQh+ZHaZpzp4v/Jei0H8wUc grlxQ6mHrSyTDYQqtm5fgFNWXiwoWut3KKPAxNEOh1Esqgtq7NWPQzREx9dPuSdsaOLF /aSsYeP4XSMCEevms4A/XNDtNsifmHU9Say+QoaVgyr9skFtQYOS5SYD89/ZB8qyv07z 1jc7MsatDcUQin8Z3NmtUxNhlRWsjqbGqD0XMvOcYmRDkSWa5tB8LhjC2Tgvo1khnOus mcKw== X-Gm-Message-State: APt69E3/7m337r/fQYx/oZvBFKMKEV995B97Ppwx+WpZYWoyGpvxvYv3 NQA+y6CUXc8EIgNFAMwxV+dCEQ== X-Received: by 2002:a1c:4291:: with SMTP id k17-v6mr2677285wmi.74.1530305568135; Fri, 29 Jun 2018 13:52:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 12-v6sm3896224wmt.19.2018.06.29.13.52.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CC2793E097F; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:24 +0100 Message-Id: <20180629205232.27190-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 13/21] 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 Fri Jun 29 20:52:25 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: 140644 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1301028ljj; Fri, 29 Jun 2018 13:59:19 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdPHNtF6qUccV88en79TK9ZikR0Z1BCxin1DnEacn3LvRY5H15bkOwNr4jONHe0ltTtxPk9 X-Received: by 2002:a37:1a69:: with SMTP id a102-v6mr14782105qka.43.1530305959839; Fri, 29 Jun 2018 13:59:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530305959; cv=none; d=google.com; s=arc-20160816; b=NkSwrt3iAyKhCebo2fSJmbLxVJm1Txfz5cbFIoKMvKgAK3j4KbDg6D3B2u3Hp5nSAZ 2HK5sfSBLv2gWlYIF+m4+nyj+ZYjPXro7aTJ7hxFOsK6ymS3Gq9q06pSh6e1kr1lOnIh NkZ0O56CoiOTA7ik1uP0zB9L0nh1JZNTwglfoXgKCco9JsT2Xwr/nsSt21HyfD3F3FWI lu7yHYo2UKKvdZ2gJGF03eiGORut+ijQNStj/11yBayK/hqyB2xahs8lnEe2pGZ59ygh mbJ9CUb0YYp5sQjIJp0SwXDueyIiBTUta/Ud8cmDTtNph3c19bUmD+j8dC4qCfpXMtP7 oDsA== 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=c74aDum2VRLDPHBDHuEVntZXu6DRGAmskOydyrau9Q63jCzYhq3Sa1DpPH7MrTjaeu qTBOLX6yHXpy25IPtUtJXPf0JP4hjWF5VykJZkTnP2lFE6tHX6AFFYj5z6tD+JuD2H6F zbQfl9IQQWU527yQ9HkGZvgf9wdZjW3DGbE163s4OP2FIUNShksZXXJuPylaZY5O912o 1s+nxpJW1l5hoomktTt6MM5L3sqRzdewmep+48Ce3MoIzVX+kxCrGyZ5NbpMWgTCwYyw AhVNNDcMGOugg+OqqJJ4ty6eQlZYFW5pvJQv5mYmxynkfLBV+DltgFRFj4CU+XWxCVt/ aJhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W1oeXhsm; 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 l127-v6si3642840qkc.251.2018.06.29.13.59.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 13:59:19 -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=W1oeXhsm; 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]:44444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0UB-0005Mc-9Z for patch@linaro.org; Fri, 29 Jun 2018 16:59:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sk-0004HJ-JG for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sj-0005NE-Ll for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:41567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sj-0005MK-F7 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: by mail-wr0-x232.google.com with SMTP id h10-v6so9982298wrq.8 for ; Fri, 29 Jun 2018 13:57:49 -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=W1oeXhsmI734sGY7fNoL+FW4L4PQgdvZiMy7Rs+oTsxneV4y24HISWzWjoi3uMi1rQ +PBByrQHN6/ZJI/oRjk40umUPboACcAsFmN5k+jxVccahSbNUsIUY1P7aQQKVXj8y/tl kvMYtbwSweqH2Us2jJXSS73NaSehYZ5Z0D1cI= 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=MxJkB+rZLNS+EfDQ7CFkrTT38yrUIfewlo+s/5BCMyxDvYOK/tkGEZkC/H7VznWHiv QiXiqnVio5Ar4MGQ6RrVMtp5sf2zrUkT+qsErhUvReuKK7M3Az+A80FBF8G6cprpgmuf rz4iSkC4L9ssRxqU7UnjFuqlC73b56GFjeqg0suMHLG4wHWsfdpvj/KRxbaAnS6u6lfc L3uwirBNWqdp5q/GWTAoqmH2K6Nk0kVfhJZQBL/oEsup6M+wKCIFdzCbPNWhUjNLNe7f tt9054CeAPwDXqhcwUaDpbg52Pw+lDXiq43s3xfqNsoLaVhNFgt6njhq/6Sk4C17v/3A 155A== X-Gm-Message-State: APt69E1kzFJIViPhgXJsOsqF8VK1F4CoGxig287I3Y2TpUJsN0KciYdq 9zaxuYvLSrkady6vAHZLU0aErg== X-Received: by 2002:adf:ae09:: with SMTP id x9-v6mr13116515wrc.19.1530305868273; Fri, 29 Jun 2018 13:57:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x6-v6sm3270852wrd.57.2018.06.29.13.57.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:46 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E036C3E0AC0; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:25 +0100 Message-Id: <20180629205232.27190-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::232 Subject: [Qemu-devel] [PATCH v2 14/21] 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 Fri Jun 29 20:52:26 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: 140655 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1312839ljj; Fri, 29 Jun 2018 14:10:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe/UkwSjul5tWq/5pZwgKRfIhrDHlKwu/i672A3XT6BDBmbhx9ifUSnJDNlzsEEsocIoS2M X-Received: by 2002:ac8:962:: with SMTP id z31-v6mr15490910qth.179.1530306659726; Fri, 29 Jun 2018 14:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306659; cv=none; d=google.com; s=arc-20160816; b=ZWgLeoTHA0mfsYMu2IFsfEYLwLBQnsvh91cCRmTDWdko4L+y8svYjsDcwlXAu6bj2W 2sipjl+UjBIPgvjA+79oKwWyW1/uOVAnHSg9vut4sDkm6vZDey1raiM+AgufBj9N1qqP GM5+5r9PaKjW2KU3qxOUa+g4d4N73p9Jqp6x+o8JH6YLmIYaICWTExc3rCMxk8msJDCB o0zgXw8x0ixgUq5L2XBC1kml68FFBTWGpyzs9HZQut3Omi6Rh5udVvkoDbAGIKtKBBhP sDv0DT6VHh3KBRU3IAky7qC1XFTOGC56YjE+IruCivHOJkBNtfBMmSBt67nN7opWfefE dl+Q== 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=cSOYKF+lu6uqjotORaZLYBVOHFlOLC8JEa9oOcbW7gwMm5kwwe8TKjlrFiFYFmtAFV z8kbHuOpCeL0dBjLEqIhK3wPr+DxixQUDK/XZO6NYemvMtxMiL283VdfG0CDzhkboE+f buWZvsgpBvJf+fkNFt+GgN8x1jczNP8h+DRdCnd5a2/BAM39KYpDPj0v9f67h8vQvcIJ i5W48zE6n4zIB7feDrshqDzUgt00L6W6TWD1X6lEwnJoseGU8JTrGbdbsbzrt/ffEPEQ Pc1QUE0Rahf09yLhqfPOYoRWA9RvyDi7w4gUBPhmy98R9z5h9W1vnLSHb9lKQImqi/jL 5Fuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QGobd5MI; 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 o17-v6si2381757qvn.189.2018.06.29.14.10.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:10: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=QGobd5MI; 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]:44521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0fT-0008QE-7B for patch@linaro.org; Fri, 29 Jun 2018 17:10:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gk-V7 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005Iz-Im for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:37505) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005HQ-CH for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:45 -0400 Received: by mail-wr0-x244.google.com with SMTP id k6-v6so9990914wrp.4 for ; Fri, 29 Jun 2018 13:57:45 -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=QGobd5MIHk0pDV6pFsvGqb9MIB/VIG0NSusOnxtamx+OqoFe+rBIKsIpfjpKG8BdS3 4l7rIA/XpEUnXFV2NK3JwmxYDMw6UfaN4xaerDp6Ulbwlx8zkRosAImLTZ3V0Frsokey DqyNo2GsfOxapAu+6rjVYIqt2PP6bWk2HYjqs= 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=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=ClZ3FxtXy3XCN0R82zG3DReQm6DwyD9OEQTqTKDO1zg1vmFmCnk4Zo05aJdJ1Hutix U4rPzYF7B3zzC3elW3Gck9NPQW/RA7toWHhYMWkHzNn6uiig2E1Iy3T4roxo3mqZSBc3 T6e3QIMZqdOWIviQXhTB+o0lONaxGlOwXLY6RsFoz0qBY3AW3hSi117qzQheGLwr8TDj sY7qcpWxdoxuMHflBbT77EPDJ+LOCk5Sfka5zGMgEtJPi2oI7pTL5zuJG+FL9pI4hRkS rmLCxtSA0Gy37K5eY3TI1ictucixu7trC2wuZsYQmPUmjS6HHRd5MvBflqId31s/INPM hZKA== X-Gm-Message-State: APt69E3c83g4uqmPapy4QsTv00n0rtU2gT3ygnX9G27vZEhech3aEHLl fhZkwejUwHvbquUbH948f1540Q== X-Received: by 2002:adf:92a5:: with SMTP id 34-v6mr14147406wrn.83.1530305864179; Fri, 29 Jun 2018 13:57:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm11490644wrr.2.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F32053E0B46; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:26 +0100 Message-Id: <20180629205232.27190-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::244 Subject: [Qemu-devel] [PATCH v2 15/21] 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 Fri Jun 29 20:52:27 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: 140653 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1310045ljj; Fri, 29 Jun 2018 14:07:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpflVLS8aO/XwqYcHhuHZyh4FUVkR3giivB0f/NET5+AH9rUtUSVy9KB2xdZduKsVw+KEOrW X-Received: by 2002:a0c:84e6:: with SMTP id m93-v6mr14802450qva.227.1530306457366; Fri, 29 Jun 2018 14:07:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306457; cv=none; d=google.com; s=arc-20160816; b=r/01Vtt33vLkuzTtJjJgmjt8LaV2pbsoDLFQ4c7ECMBNY9rE6DWeJnspqcsxGdIcr1 G4KSE79SBqQxsn7WpHT6TCasxMx1k8KdOldPixvFB1c2R4x5MF9YY4SVma1h+hy5dHDW wAopehvfKjdPBTyZn5d2C2rcUYeZxjCmSKNcgvU7dVh+SHAlERYZRitTNDFfXMmkEjQ2 ItbJhO0bSENIYdkQxYf/9e/FzhmRdeiUkIb4/B/g/lczk9iEGkSNolPWHzDNqBUN4RGz aeYqSYw5OcpWumLKw9cuswVNPGo3Gd5Efg7yPd1NP/pR+oI3g5duirtsjDFjuP5gULw8 lciA== 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=p9rRyxTJITniLi4ouOl1Cg07vbyUK2xhBh3DN9Z1jp4=; b=1DjR7N3B7RzAj2HZ7UB7ByMrtt3V642IWS5N3vxQ+xqL030Aqii9jyoDqxPwed65iT x8VsUmnPu8/7+ZFumsfD2nNh5Y8sBxz86jVgJxiDEYsCe1uLLLYXDCsuu5MFLDgFM0Gn lVZbuu0z9BViuQ6PuwsUq4x2caZpam37xsWIpnji+mcxoSOMi3nnSVXkkOr/ScLWkfb7 AqIgiP8ofYUhOsTI4pr9vdknMMUpiT0wLo15VdTMYpvXyAwMJEMnN/diKmeNZL68y7NU 1DMsTjBog8qIIPHDOYKfhHs66BYw1VKcEg0+guunRmKSleJtnMyppZGmsmiM5VKWf66g 7rBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baapDIev; 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 88-v6si840925qta.172.2018.06.29.14.07.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:07: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=baapDIev; 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]:44488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0cC-0005qO-Oq for patch@linaro.org; Fri, 29 Jun 2018 17:07:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nw-0008Du-8M for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nv-0006f1-Dw for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:52 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:32874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nv-0006ci-3B for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: by mail-wm0-x229.google.com with SMTP id z6-v6so2894382wma.0 for ; Fri, 29 Jun 2018 13:52:50 -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=p9rRyxTJITniLi4ouOl1Cg07vbyUK2xhBh3DN9Z1jp4=; b=baapDIev7maUaXxjb0BXMJ8iOE+BA6mWiuegqEPYhvj2Wu/vCwZzg0DssFT50FYLLl jv0q1qVGq0UG7o7fw+kcAa8o2PzXsdyvbISiTQRKGytfUguBENhb9fNxl0M/dT5QqVOk Dy4D4L8EAlSEADVy6yV6J96OB7cJmH+MfrchY= 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=p9rRyxTJITniLi4ouOl1Cg07vbyUK2xhBh3DN9Z1jp4=; b=ayu5puKa+C0Nu7+vePY9tWB0PwNLnTSOcopGSrQ2n4jJTrBxPjat+txK7tt06zLtwD AdTg8TTnjfrlj5ZGA9l/SI7btlbPKZWzEEiLNdmau9gU3a9EDKGBWwHG9SPRqGV8Le5O y2OhD9WbhCVDR7OwYBVp63uGkCmlCbAEMTHHHaqVbQWeFrA1e68sYri1ztIRj0lut9No p+DeHmcnCm228KMs7dlxBzQ6Ggqupur5hVVCY8CJIBCY3379LiQYfIbCur5xUkunlAXA GytBVxASaDe4eU4+WnrAwkTqPcrFYlHDr5T+PCriz3OvUlA0sRfyDUUAJTkM5367qsqe VPHw== X-Gm-Message-State: APt69E2x9wwdWAwGI4p2kViFv+p8bRdD8AK3M46Wzwk4yCbxQ38qZ4Wz gootDXNEuCTUlJDRjSBM+HHURQ== X-Received: by 2002:a1c:58d5:: with SMTP id m204-v6mr2633833wmb.118.1530305569876; Fri, 29 Jun 2018 13:52:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d1-v6sm6731791wrm.9.2018.06.29.13.52.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 11EA63E0B55; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:27 +0100 Message-Id: <20180629205232.27190-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::229 Subject: [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step 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 need to pass environment variables down to the debbootstrap.pre script to be able to specify build parameters. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..388e86ada2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -293,6 +293,8 @@ class BuildCommand(SubCommand): parser.add_argument("--add-current-user", "-u", dest="user", action="store_true", help="Add the current user to image's passwd") + parser.add_argument("--env", "-E", action='append', nargs=1, + help="Set FOO=BAR in envronment") parser.add_argument("tag", help="Image Tag") parser.add_argument("dockerfile", @@ -302,6 +304,12 @@ class BuildCommand(SubCommand): dockerfile = open(args.dockerfile, "rb").read() tag = args.tag + # Process env setting + if args.env: + for e in args.env: + (env, val) = e[0].split("=") + os.environ[env] = val + dkr = Docker() if "--no-cache" not in argv and \ dkr.image_matches_dockerfile(tag, dockerfile): From patchwork Fri Jun 29 20:52:28 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: 140656 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1313780ljj; Fri, 29 Jun 2018 14:12:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdpyqPNRp2QXWkUFGs6Yi6N/76TDZZbVT+/m8RKEx7Rr+zSdfwC/wLWwgZFy5F2tP6/cRsu X-Received: by 2002:ac8:6c3:: with SMTP id j3-v6mr15107084qth.138.1530306732937; Fri, 29 Jun 2018 14:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306732; cv=none; d=google.com; s=arc-20160816; b=EByj3AknIjqweAzFsjdR6GqqEsNwa8k4UnMvBLiiIPPmlTzfD4cHU/2KQXc9elUx3y C+75y/+IhqHoyMUBkvEW/OtSSMx0qj/n6Wtv1AshvnKKntRvnMIQEDNSwwYNoAbh5a+p 4D3Q3/xph9FNgVUmZLSe+/ujon/Sp5amChAL1XM5CT4P99Y2cL80AUy17Y3yp8XBonmV yqotSfZbnuojLhT+aTHz4q7E0aweSWi2FgK5AamQ/H5WKRA2wpK0ZgIwqlDeinxibxwn 53jl+LgnU221jP6T7klxnSwYGS/4xCLmigRYCyc8DewRbh80R5n3QCXMrQZ9ku7lZx7N slSQ== 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=vGShsiXDO8MhQ0MmNwbhDqqSQej6vg9iEpFxuKyuATzIHgsFIemYt/+GdzvTBcU3kc aUphrTvlzozTggNyeku3+4KpKMbmZxBTp3yIiXG4XG5A7TlKH/u5+bIAzEyXUxFv+eUD p0ptrcSPGp9LcKnvUpF+t+TJs6y29gnPkzJCtMVmKYG9Kf35XFuH/akvlNV3qYOW2V94 zk7B8gmAe7HDJFdDxjVPRVh32f9jSbiUEkz7XbuOEw5V/M/+CsdzNqPinu3WJvqC6OF+ tgsB8h1H7Cls1dMejH4G4m5YNIFEDZj99jWZ8QNIzMQWBWFdynpiqAd2Q4BNaacyr3Cz GYZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hiOkK3SM; 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 i12-v6si454718qtp.371.2018.06.29.14.12.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:12:12 -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=hiOkK3SM; 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]:44542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0ge-0001Bc-EQ for patch@linaro.org; Fri, 29 Jun 2018 17:12:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gn-VA for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sh-0005Kb-C4 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:52826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sh-0005Jp-5q for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:47 -0400 Received: by mail-wm0-x230.google.com with SMTP id w16-v6so2773243wmc.2 for ; Fri, 29 Jun 2018 13:57:46 -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=hiOkK3SM4hReMEFXh9GKgqlPbV5ZMAAQNw0T8bpehyG5JUgs3TvOnOKdi+705rxOiK 5EQG9EYtVIc8s68pcvha1Uj/Kq0WJAEHH31NbFE5OvpQ3WsmSz/08F8vfVaraFjAxWaB hbK3B7/WVtruoOMFTpYsC99RNEF7CQXvbaeWI= 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=SeGP0fC7tKG7XCEMxZSPzO7sECTmoUZ7OTVesddysuomAovjeRHF/JEYqgKLNlGJFL plDpWX7jIhlRmIeYKRvdqatl9viP16hyCVlxXGFi0sNAUFB5zPfaZhqj0+xU4K2pM/fE Nfnshla94NUOBCIDGF9brUfPpRUN53q/A0S3DSBDwxRRd58168Z77FEllVCzB3fQ/I5c +Pqc8SLP6nP2SHdQohbOupgPIaBbfCAC3P0z42gGodzQAMY25XlmLNfiZLwkz5941Jjh i8Y4cJXwII025nLtrLEy8k87rPZkxo1QUivruIKrD1chItDHlCB2uXEFpuu7+Pj3G+AB Ioig== X-Gm-Message-State: APt69E2/PmTusdPyY4LKNpzBz8VQMmrCDG24BnrBiewmxgYh9ElIfyoI C710qsacQ6b0GTCNrwxjC9smIg== X-Received: by 2002:a1c:6b51:: with SMTP id g78-v6mr2883272wmc.149.1530305866000; Fri, 29 Jun 2018 13:57:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 130-v6sm5499296wmr.1.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 240173E0114; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:28 +0100 Message-Id: <20180629205232.27190-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 17/21] 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 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 Fri Jun 29 20:52:29 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: 140650 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1307353ljj; Fri, 29 Jun 2018 14:04:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdW8WNGrQDLjlR9542+zrP5ncu/zhnuqk+1kRZfHUSHvmUyB4A0tdIJmYLyJE5FOvrQwI4n X-Received: by 2002:aed:35c2:: with SMTP id d2-v6mr14961803qte.219.1530306279426; Fri, 29 Jun 2018 14:04:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306279; cv=none; d=google.com; s=arc-20160816; b=fPHbLjQ3zT6nhoiKyxw6a5nnGigqgzK0cXafUlwpHE1RijxesujdMxg3S3u6O2zMn4 vTCezYRP18hwpEqKNdnJyMOlXK9l043GaiOIRMNrkj+ROHfgCQo2oPC0vvcFfRHiYW/m nE26KWA4Bfqg8xnvyoSG9mDUv1NoDN6alQ6pzxXiKOQgrPfRATdqsL+icxV0Q5n6h0H6 jbmH8u0gSyH8680KXR2tcQFQRSOwOHafMk3fw3p4DlDsJe1GRJfvVMdl6oybstek6Qes aXH8Wzlce7ZUffGeYtNswSGYxy0OPXMYd3o1PAHUc95r3Xwfo2Kfr8jbXwgMEPzwOKYk THDQ== 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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=lGG841topLrgGoLgxFsgCT/EsevMwbtkgsiXxZxUy+up5Jb7f4PqAxPUsQ9hNhulsZ +MDD5I+3MaCeX6mKiCLstKwt/G5lVVVylPJgN/bQKCCQcNEaJcDLcWGFgOFNDCOrAD5l mll6hPQUGLcA+jWb5xzQ68EtUL78+m9acDSQeJEcs1tFOuM8RiIm8p5Jf/OS03/LsXBF /M10Rx/ooRn8rnnA0DWPPo9SPa5l07IgK4VOSDKMkplq4vGRuRASLrDhuyZUmh6WnxRW F97pz8AxsuhkodgyxTTnVynABtQHwhg8WJbajkCpOWhqF+7NGZNomEUtQjwMDg6iNGIz y1ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BjWCgn+V; 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 y38-v6si3438700qvc.17.2018.06.29.14.04.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:04:39 -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=BjWCgn+V; 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]:44478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0ZK-00032B-U9 for patch@linaro.org; Fri, 29 Jun 2018 17:04:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gm-Ur for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005IE-2T for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:45038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Se-0005G7-RS for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:44 -0400 Received: by mail-wr0-x243.google.com with SMTP id p12-v6so9977198wrn.11 for ; Fri, 29 Jun 2018 13:57:44 -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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=BjWCgn+V9z84kMiKlIhb+N4R0HhmuXm9g3TgsDwdwdkb6oO2t0gCoIDL3/WUIcRAD7 lGwzHy0g+Qpdfh28CnHqv0gc8DrYsFmdGrD1jzOVW8GEyfrsDTpwAVZO2eqFm8z2QY6C V+lCM2kGS7uReD0kopf78R+PtlJZCFDORg2cc= 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=nMMG5FoBgUUuNeOJSa1/MRhr8LQ3s2pKl/ud7dsXoLI=; b=ZhCFMwoGx0/kepmnb7I8XouOjUtZ+wDOVsYoq78WX6q9aqR05qtyftDcrkdOhY8jU0 XBCKnJVXBc3o11oJ+eFFBEv9sKR/88aH+zfxMm2W1kO9/Zx1ffyLCERee2OrT/5fMQ13 gGpCQVinJ1+AW+/kEZ67hCf8xYWKLUjMWwuFcLCJKI4LliDEgJ2+1+zgKk+xJXmgjizJ MKFH5wxXJqImgTpi/JOtqXm64S1D/TMhG9JEvtrj5ED8FqFXxZrQyJI2NeO9p8FikZ0+ bMV+CfTi0ePej9poyaS850+t/Izdj0zBrS7+ERNbN2LItN7UxxDLe79c7ZaAD55OenNH xMDQ== X-Gm-Message-State: APt69E1KyWd/lFzLrB2f5ETjw5xgu1g8UaP6OfqooyyX+voYaxOnZKBC /20NNa10D0aK9NOXmv3dngTPeQ== X-Received: by 2002:adf:9ed0:: with SMTP id b16-v6mr9996615wrf.170.1530305863431; Fri, 29 Jun 2018 13:57:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 4-v6sm4386705wmh.14.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 370663E0B6C; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:29 +0100 Message-Id: <20180629205232.27190-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 18/21] 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 --- tests/docker/docker.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 388e86ada2..8ceaf78681 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -110,9 +110,13 @@ def _copy_binary_with_libs(src, dest_dir): if libs: for l in libs: so_path = os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _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 Fri Jun 29 20:52:30 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: 140652 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1309477ljj; Fri, 29 Jun 2018 14:06:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdO2NIrrex2/VoLBLYEYrEv6EzaLuQ27CzGppyeM4gOQW7Jv/HDM90S1YUG45dUxlYyuM9W X-Received: by 2002:a0c:a3c3:: with SMTP id v61-v6mr14317982qvv.99.1530306419867; Fri, 29 Jun 2018 14:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306419; cv=none; d=google.com; s=arc-20160816; b=Vl3RiinLkyd7NSHVJfNr272QKYGu7gf6u9c6paYQsAPeeUL5iwkkEi+AQ1SjU6/feq PIQh/FgherMu12g83UxTd7jIhi2W9Wvht5vq9kvV7KUUOL1l9QoJSj5eXJzNT/64DnTi G69X+Iz3924Q+CQsX3fqaUkbNnFD+pp1e5a7e1R7aGgBHo+pABos0waf8z4Wp+2X/iZs NR4lG5Cz8C3Au180OvifO7mdjBXrKOH9rNs9gZUOBvH9My0om4v/dht63UWY2f2xkJZL YKQB+gEZxtho0W/DMM8wrw1dEQOXx77oEz2Rxj0W1AWmEOcZbugIWAHny/rs3v7s0eCP 1Dcg== 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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=g/hSxRqK+3pq5K+5b0FbXOde9Vz1T8S5Ar4e1zsdX0cjfI1YgeIUHaXidVzqMYJKTH TNieL2xsBb1zs9mXDV8avPony2TkZNecznJPHTuU6Vh/S1G+ZAlTt+KCxEdiTWfjc7uu 1kPElndWuEeGw8JE6Vx0IZK3mTvAGOWssDCSXUDnPLHlJRnBl3O3aNuSThUIup59X70Q 37p8uqOGHIr/qqGos3oNGbKQEpoAqrLuez+Gv46JEIOtsCmJARW6lVmDq/0L/ba9m87x qBWFz+Jm1Yq3p3FRXlMf6a892SwArtKUzqb0t19fWCjHJK3WWu0JrenqvR8Woxq3FmsH fUng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Lvy+vfn+; 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 c9-v6si9804121qtp.300.2018.06.29.14.06.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:06: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=Lvy+vfn+; 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]:44492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0bb-00060Z-AQ for patch@linaro.org; Fri, 29 Jun 2018 17:06:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gj-UM for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Si-0005LQ-BI for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:46941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Si-0005Kh-4T for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:48 -0400 Received: by mail-wr0-x234.google.com with SMTP id s11-v6so755784wra.13 for ; Fri, 29 Jun 2018 13:57:47 -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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=Lvy+vfn+XYzZxAbX8nQ1kEHYZXYB015VvvWxVkkARQ6IEsIUliOCSRHE0KUjqhRxP7 BBS35LXfU8/hnACr2Q7br7HrRDVHHk23iVnCsKtR04BQeJujRsLzY3LGJEatWOqVS0TL PPnvSidijpPukhURGER6IHfKSc7JhjNuh+zJo= 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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=Vpe0ZZ+WaUcIdQl5X/Pom9VLuXkCWlEO55rp8OyF2ZNP44jkM+2hbZ2Y9DCrxY15Sr NOHeHNi+ubR/x1gRLHAINRe2pej+HsU95DMaLBAszaRNwpxDVFFs4eDC8ZdokplQ4CdK Mgsf8XUqkUDzNZvU7uZrD70Eh/fUEy1xIVSlSr8NT6xbh9LTJ626hy7LvQF6yyzzhm7n K1bQ+VY364nB9hKa66AjAeaKGfgWv3LehGlmAJBcnmSAeQkmXiJCz0z2TvZetYqcKObx VjPewXL0wGhrHMg93AFN7EN+VMm9UIFI5itqUCNaycaxL/wd0TUHxS9tjo+XwrLaIETQ 7Gsg== X-Gm-Message-State: APt69E3aI6Rz08DTKU7OmV7Y1iczR61iK3wXkOFqJrDl3bjkiZv+Bd3R IjkUp+jWPWM2EoZrUa2Bk9MifQ== X-Received: by 2002:a5d:4503:: with SMTP id s3-v6mr13235042wrq.191.1530305866936; Fri, 29 Jun 2018 13:57:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z14-v6sm12069661wrm.49.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4A1063E0B71; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:30 +0100 Message-Id: <20180629205232.27190-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::234 Subject: [Qemu-devel] [PATCH v2 19/21] 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 things the dependencies are different. We drop the test and EXECUTABLE lines from the general rule as they are no longer needed there. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8641f5da2c..d3bd2f57dd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -49,16 +49,32 @@ 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) \ $(if $(NOUSER),,--add-current-user) \ - $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ - $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)),\ "BUILD","$*") + +# special rule for debootstrapped debian-FOO-user images +docker-image-debian-%-user: $(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-$*-user $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)) \ + -E DEB_ARCH=${DEB_ARCH} -E DEB_TYPE=${DEB_TYPE}, \ + "BUILD","debian-$*-user (debootstrapped linux-user)") endif # Enforce dependencies for composite images From patchwork Fri Jun 29 20:52:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 140649 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1306869ljj; Fri, 29 Jun 2018 14:04:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcbcAhV/HEE0DkvsCwfhrU+4XL8s2IXSx5SeenCN2LYuOEFfpTdc5QbejObRiFqcn+m6RWN X-Received: by 2002:ac8:43c7:: with SMTP id w7-v6mr15191749qtn.371.1530306250111; Fri, 29 Jun 2018 14:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306250; cv=none; d=google.com; s=arc-20160816; b=WrD4uc9oB4KL3IFAQoiNsYh99LPxFhCWPvYB5c7ln8qm2OqjbTVDs9AO1tll/4H6fM VIXVm6VmL95o/yyj3176JRROR/+UIlRDWIuhIPOYLDUaO2H6k70gz4i9qLANDSFXOG6l QUYCFjObGEt0si6LucuSnxjE2YApEdn//pUC5nI6ARy4TXxKOl/3MOQ50NSiUQInAMSF MgLfc7MY+YlW/E50ib8I3I6+fnAertJpIsC2LJAC82/fAJTtjcvC01+RdBzbWHDtNOWy FrgVqthPcYIrvv+6S2Hij9juO1gDyhuoG9ILnW9em4LXsFK/2nDqfHT0kyruxzfiQNMs qcJg== 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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=SkGE+o16cqP9VKlCsNJwh6Mfgbhsjs6+7zeCQlE+Vz+bZCdKbivab6BUKqD/Qyg0wV hwHEZWwyJsTv3lhmTi+eRhfJs2ScHPmyiMUqQlzFugOTNO/GPhAMC3tuYLNwAJMgdlj9 A0oiy1hVuYUJcZ0HMH3s1clx9GjC8u59LLaj8yp1TjDLSlrE9AK9JRtSiHI1qZwEhLPo F4nDLCBFbpvfoHpTRegb4+gAHraU8nPQMOw8E3OsDbqY3SoQ3LRTZzUl0JgdTusdafi/ 5xaBWQVopijWRL71dNZw6cPt2fkTw6IzxMJrUzo9f7u9w+Rw2r5jHxkCMcS7hFEjfvhb jVZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NqH7EZoW; 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 f35-v6si9542336qtd.28.2018.06.29.14.04.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:04: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=NqH7EZoW; 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]:44470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Yr-0001os-Ft for patch@linaro.org; Fri, 29 Jun 2018 17:04:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gi-U1 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sg-0005Ji-FC for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sg-0005J3-8U for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:46 -0400 Received: by mail-wm0-x242.google.com with SMTP id v25-v6so2447885wmc.0 for ; Fri, 29 Jun 2018 13:57:46 -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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=NqH7EZoWgSJ7thSoG2gPWaPnSqEiAg0qVoy1BPTlHq5X4sEUG/buaQyOnpPn5fV2/l EskWwVRGLXehxutzE7/V9ouhrJsrgcfrr4yORdUAARRJ3rxW1iDZucHfxnZS1aBDMy4m sUlfE7VxMTsT9W8VWbGrjGqSS5lp6PZQYvAjA= 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=PtLG316CMmxeer8Tmeja1sS6NDX28BTKGaJUtFitFlk=; b=RxyaldpKQBM0zwdx921rKnco/Q/zBCAoCuw9xlP5Xjyrb5Y44FZ0b/o0F9psiR3Zk8 iSX+zH2ysNq0mz3//V3ASbETdX3u+D+ynQBXd2Ta/jsHCQkn+ejYZrYngoA0SV1x7ETp SiAQ5/C9FitRz6BMmpQPeCFfi7I8SgaTuYEjDJ9BGLrkTmB586vHdprn9lduuJjVVVeA ocp0u3+s7tWahvecGC7pIE7FTTXSg+lmhqaqWwBHQQLu7XIiGEpUcfOuMEU12+1zh93d Yeawk8VuG/+mRUf0x0a0FrW4KfUv2moNX9BSXXBUoz8fjh3Bw5lSRoNfStpqUmduR18T +lRw== X-Gm-Message-State: APt69E2COpG6SP2gW0nISEnD3oQYUp1dJdvJyhDaFUe7dergOyNzaq4s JOsB0Fw3N8gG2zZi92vcMTSnpA== X-Received: by 2002:a1c:149:: with SMTP id 70-v6mr2943893wmb.2.1530305865074; Fri, 29 Jun 2018 13:57:45 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 130-v6sm5499295wmr.1.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5E91A3E0B75; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:31 +0100 Message-Id: <20180629205232.27190-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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::242 Subject: [Qemu-devel] [PATCH v2 20/21] 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 --- tests/docker/Makefile.include | 28 +++++++++++++++++++ .../debian-powerpc-user-cross.docker | 13 +++++++++ 2 files changed, 41 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 d3bd2f57dd..556b260fad 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -118,6 +118,30 @@ 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-image-debian-powerpc-user: DEB_ARCH = powerpc +docker-image-debian-powerpc-user: DEB_TYPE = jessie +docker-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc +DOCKER_USER_IMAGES += debian-powerpc-user +else +docker-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 + +docker-image-debian-powerpc-user-cross: docker-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), \ @@ -153,6 +177,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 From patchwork Fri Jun 29 20:52:32 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: 140651 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1309069ljj; Fri, 29 Jun 2018 14:06:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcgk8lvpmC+VkGccwO7K8VBjZZw9TYMkfJptKWGm3VhWApF0UzVnGpt80GZeOhVOuFfPLZy X-Received: by 2002:a37:7a47:: with SMTP id v68-v6mr14561664qkc.166.1530306394735; Fri, 29 Jun 2018 14:06:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306394; cv=none; d=google.com; s=arc-20160816; b=B9Vxrdk5eDNZoMArZ5/pYTHhLknChiUaRwhCt4F5We4SBYKDX2bUT29RUhhYMUUsPG T9P8bp/ZU2D14Kao2MSxKid5uR2k622wTKyLJBfPmmG95pAXY4a3X+OwDJtnQeilWzWE cY3JTXfHv/zTRwLwtSSanTDKB4v3wJWVUZ8P6iT5n2Rl9LsoDTkGLzHVq64LPYtYF4kr Mw9tOMCIIhTcDeSJxWm3ROO14ZCmQSzS8dlH3+4UsGFDZinYr2Yy0/GMDVj+nrXvgOvp J9032D4rAues/teSCQhjJwrfnX38/lQrnYY8N0IMGZmjQnTRq1YF/qgmWEMKKqBIWMBc aOoA== 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=BuJC6Wok+G+HTVFueNtjKv9PJtDM7yYeRfyNbiP/Yb8=; b=VWs88nrlxvhrPPCyMkz2wIZoXEFDRs+DWoSuJ2y1amPmhdaYgK4k+XslYmNcX2Dd7V 9zbU9PtFaH8H2CKADssoMGOp0nCxKB1peVOqk5o+Cp7ZbWhyRDYtJPwt54vkVSzPCt0q DAG0QFewTy3VayPnnpKP2h0x+8wdknnhOXaNwEsIH9DQHTxlKRpJvpG/VzHf9jyIlK9X 5Svn3zJkhYu8VDvezPStc94hcSzbG/QYWUBf3eGll4K0CmJ7nCsj1vL18GeLQlOG2Qc7 W8DYhuufXrL3Q6uYOzcrGmyeKVQ26TNpQPjcOX2yBHbETC0ACJtQ/6zJtgMMLMGG6j8L 4NdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eLI5roC3; 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 13-v6si604279qtx.361.2018.06.29.14.06.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:06: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=eLI5roC3; 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]:44486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0bC-0004Ao-6w for patch@linaro.org; Fri, 29 Jun 2018 17:06:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nv-0008D6-EG for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Nu-0006ch-EQ for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:51 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:40226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Nu-0006bK-7C for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:50 -0400 Received: by mail-wm0-x236.google.com with SMTP id z13-v6so3291238wma.5 for ; Fri, 29 Jun 2018 13:52:49 -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=BuJC6Wok+G+HTVFueNtjKv9PJtDM7yYeRfyNbiP/Yb8=; b=eLI5roC3ZIpOeV6CTpS6xyCXjSbOnflilMXxR+D5hPQQ9VWnEPF30KqJYU1HwIF/3H 9KPqqkfTxEHw2KXDHvskqXY9JwiwH4wtdWT0BQCijlAMrcnSr2wQy4XlbQVA1laeYbrk 4dj7rJ10xp5/Xxursms+YlVulUYMvfKz+Dte0= 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=BuJC6Wok+G+HTVFueNtjKv9PJtDM7yYeRfyNbiP/Yb8=; b=po0uu2bDFfWeK7CWTHdb7y4YT44IZ2+3MHXToeUkXpBYkQgtMYTCV5MJX+J7SsuJvs yLLDQRcCye9SNr110mZcEFwM0U/E85syLrCy1D1D0xV1ktGypS7BTNLdmYancgEK9Bb1 2G/WwdzdWaJq291MR7FWnEPD3SOnNCy33pB7DfHD1dAjanQk0SSAT+9jV8alCh3XUMmw v+TPSk5XmgVQSUDlNhvdzJpHXWz/i8AvnY0WZ9rJTVZw8whFjYB2lnepyR0/61To0DDt aN/PlS/CMZ+1fvpOtjSznts9UUBgafpdOlf/PsPBMdE44dHqTMeunVwAza4AKnBvtM5Q Ik0w== X-Gm-Message-State: APt69E2n3cIogfPMDki5/7Ly14+sCq4yUnw6PPawEZSPdWPsoyE6lmfJ gRmlD6WdQlZr+mdc7i2yD/2hDA== X-Received: by 2002:a1c:7a19:: with SMTP id v25-v6mr2581358wmc.81.1530305568927; Fri, 29 Jun 2018 13:52:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g14-v6sm9552825wro.86.2018.06.29.13.52.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 70FE23E0BB0; Fri, 29 Jun 2018 21:52:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:32 +0100 Message-Id: <20180629205232.27190-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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 v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu 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" Use our new ability to use linux-user powered docker images to build ppc-softmmu. Signed-off-by: Alex Bennée --- .shippable.yml | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.17.1 diff --git a/.shippable.yml b/.shippable.yml index f74a3de3ff..12f9d3b221 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -25,6 +25,14 @@ env: TARGET_LIST=mips64el-softmmu,mips64el-linux-user - IMAGE=debian-ppc64el-cross TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user + include: + # Additional linux-user cross build + - pre_ci: + - ./configure --target-list=ppc-linux-user --static + - make -j$(($(getconf _NPROCESSORS_ONLN) + 1)) + - make docker-image-powerpc-user-cross + env: IMAGE=debian-image-powerpc-user-cross + TARGET_LIST=ppc-softmmu build: pre_ci: - make docker-image-${IMAGE} V=1