From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305672865196.26460504570002; Fri, 29 Jun 2018 13:54:32 -0700 (PDT) Received: from localhost ([::1]:44414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0PY-0000jL-2f for importer@patchew.org; Fri, 29 Jun 2018 16:54:32 -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) 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) 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-Google-Smtp-Source: AAOMgpeITGRNRPYcGAluMpMIbm2izMY6H2vlSE/OdjKBeBqhEzLUPV1b1CXBywuHok36tMkv+KFxKw== X-Received: by 2002:adf:f9c5:: with SMTP id w5-v6mr1826190wrr.105.1530305554073; Fri, 29 Jun 2018 13:52:34 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Builds only require: - dtc - keycodemapdb - capstone Signed-off-by: Philippe Mathieu-Daud=C3=A9 [AJB: drop wget cache] Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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" =3D=3D "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" =3D=3D "osx" ]; then brew install libffi gettex= t glib pixman ; fi - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-see= d.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: --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305742802908.8189525603499; Fri, 29 Jun 2018 13:55:42 -0700 (PDT) Received: from localhost ([::1]:44418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Qc-0001qd-0O for importer@patchew.org; Fri, 29 Jun 2018 16:55:38 -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) 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) 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-Google-Smtp-Source: AAOMgpf0ICg/KC8UfYdhscxcUf2kSXKF7Yx/y7D4uA63aae3dco3vZZ4UQoG1p/fZTz2dWecKn4HsA== X-Received: by 2002:adf:a45d:: with SMTP id e29-v6mr13094659wra.121.1530305555955; Fri, 29 Jun 2018 13:52:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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=3D"." + - BUILD_DIR=3D"." - TEST_CMD=3D"make check" - MAKEFLAGS=3D"-j3" matrix: @@ -68,11 +70,15 @@ before_install: - if [ "$TRAVIS_OS_NAME" =3D=3D "osx" ]; then brew install libffi gettex= t 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=3D"--enable-debug --enable-debug-tcg" + BUILD_DIR=3D"out-of-tree/build/dir" SRC_DIR=3D"../../.." # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG=3D"--disable-system" compiler: clang --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305845067232.06680256352524; Fri, 29 Jun 2018 13:57:25 -0700 (PDT) Received: from localhost ([::1]:44433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0SK-0003S3-6p for importer@patchew.org; Fri, 29 Jun 2018 16:57:24 -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) 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) 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-Google-Smtp-Source: AAOMgpdK0WlGuO9i6p9wJa2hCI7/8x1di5chqRXLAadwi372AKz6SFTBRsS0T5zqi2tbaFiDvVbAgw== X-Received: by 2002:a1c:5752:: with SMTP id l79-v6mr2596311wmb.103.1530305556741; Fri, 29 Jun 2018 13:52:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing.rst | 11 +++++------ tests/Makefile.include | 10 ---------- 2 files changed, 5 insertions(+), 16 deletions(-) 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 mor= e information. GCC gcov support ---------------- =20 -``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 b= uild. -Then run ``make check`` as usual. There will be additional ``gcov`` output= as -the testing goes on, showing the test coverage percentage numbers per anal= yzed -source file. More detailed reports can be obtained by running ``gcov`` com= mand -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. =20 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 =3D -n $(if $(V),-f,) =20 .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-so= ftmmu $(check-qtest-y) - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command,QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF) \ MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=3D$(SPEED) $(check-qtest-$*-y) $(check-qte= st-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,) =20 .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_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=3D$(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,) =20 # gtester tests with XML output =20 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305677992367.9306774989832; Fri, 29 Jun 2018 13:54:37 -0700 (PDT) Received: from localhost ([::1]:44415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Pd-0000pr-9h for importer@patchew.org; Fri, 29 Jun 2018 16:54:37 -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) 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) 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-Google-Smtp-Source: AAOMgpfD1wZrSVeRwc0m6ZC0MfF7AFiatloD3rRsSaFOOuET71zGvAey6o68C87x8crRUlRiOefXew== X-Received: by 2002:a1c:647:: with SMTP id 68-v6mr2923557wmg.82.1530305557585; Fri, 29 Jun 2018 13:52:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 These are temporary files generated on gcov runs and shouldn't be included in the source tree. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitignore | 1 + 1 file changed, 1 insertion(+) 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 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305840335412.5548973825896; Fri, 29 Jun 2018 13:57:20 -0700 (PDT) Received: from localhost ([::1]:44431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0SF-0003OE-Iw for importer@patchew.org; Fri, 29 Jun 2018 16:57:19 -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) 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) 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-Google-Smtp-Source: AAOMgpebHkcDzurtkU9iDoNU4hnSr2KKOdFl7oItJzbAYZ1kFynBuPs0Vm+i0yyfXi/GcogKOkaJ1w== X-Received: by 2002:adf:edca:: with SMTP id v10-v6mr1991721wro.264.1530305558612; Fri, 29 Jun 2018 13:52:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Useful for debugging if nothing else as the gcovr on the Travis images are a little old. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/docker/dockerfiles/travis.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfi= les/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/sou= rces.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-autor= econf gdb strace lsof net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autor= econf 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/cl= ang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306001761839.2162523798505; Fri, 29 Jun 2018 14:00:01 -0700 (PDT) Received: from localhost ([::1]:44447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Uq-0005qM-Sc for importer@patchew.org; Fri, 29 Jun 2018 17:00:00 -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) 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) 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-Google-Smtp-Source: AAOMgpe/WyUXQIm/xZa6j2aQLAPem1vVKKaN7KLSxZG8W0Xdv9cM82xasPeuzrSi7gJ0EU4vpGIgHg== X-Received: by 2002:a1c:7f95:: with SMTP id a143-v6mr2645930wmd.108.1530305559577; Fri, 29 Jun 2018 13:52:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 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 =20 # 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=3D"--enable-gprof --enable-gcov --disable-pie --target-l= ist=3Daarch64-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=3D"--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=C3=A9e +# +# 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 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305843027485.8774573904327; Fri, 29 Jun 2018 13:57:23 -0700 (PDT) Received: from localhost ([::1]:44432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0SI-0003Qm-75 for importer@patchew.org; Fri, 29 Jun 2018 16:57:22 -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) 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) 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-Google-Smtp-Source: AAOMgpfgcZmIzzyUmqTC2QRKWjf1B8BxNEUxSJhq65D4Q0MNqKeaHe21+FBYugul3eOKb3Vf3Jg2JA== X-Received: by 2002:adf:adae:: with SMTP id w43-v6mr13927625wrc.251.1530305561934; Fri, 29 Jun 2018 13:52:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- v2 - s/to any/to delete any/ --- Makefile | 11 +++++++++++ docs/devel/testing.rst | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) 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_blo= ck.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") =20 +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 ge= n-op-arm.h @@ -1073,6 +1081,9 @@ endif echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the conf= ig' +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. =20 QEMU iotests =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153030600529733.687717315113446; Fri, 29 Jun 2018 14:00:05 -0700 (PDT) Received: from localhost ([::1]:44448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Uu-000629-IY for importer@patchew.org; Fri, 29 Jun 2018 17:00:04 -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) 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) 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-Google-Smtp-Source: AAOMgpehOcqOZuSJUiCzrQ6ob46aVMSaFRMEbhmTI79Savisb7Vc4NC+MFv+MI8gVPcnR+WNrt2LHQ== X-Received: by 2002:a1c:d7c3:: with SMTP id o186-v6mr2666411wmg.67.1530305562699; Fri, 29 Jun 2018 13:52:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- v2 - s/generate/create/ --- Makefile | 13 +++++++++++++ docs/devel/testing.rst | 11 ++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) 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-re= f.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 =20 +# 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 =20 ifdef CONFIG_WIN32 =20 @@ -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. =20 -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. =20 QEMU iotests =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306251204457.3556092613561; Fri, 29 Jun 2018 14:04:11 -0700 (PDT) Received: from localhost ([::1]:44474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Ys-0002S1-GI for importer@patchew.org; Fri, 29 Jun 2018 17:04:10 -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) 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) 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-Google-Smtp-Source: AAOMgpfIICnkecoHRgmSl5oEiwWWVbpo4gSwuooyP2bwKoERC+5doa7JlKZQ6n2ViPvd69dPOarymA== X-Received: by 2002:adf:f002:: with SMTP id j2-v6mr3880118wro.260.1530305565840; Fri, 29 Jun 2018 13:52:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 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 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 =3D 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 =20 obj-$(TARGET_HAS_BFLT) +=3D flatload.o obj-$(TARGET_I386) +=3D 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=C3=A9e + * + * 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 >=3D (abi_ulong)(-4096); } =20 +/** + * 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, } =20 cpu_list_unlock(); -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); _exit(arg1); ret =3D 0; /* avoid warning */ break; @@ -10127,10 +10124,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_lo= ng 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 =3D get_errno(exit_group(arg1)); break; #endif --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306181277689.4163580826288; Fri, 29 Jun 2018 14:03:01 -0700 (PDT) Received: from localhost ([::1]:44469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Xk-0001e7-E0 for importer@patchew.org; Fri, 29 Jun 2018 17:03:00 -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) 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) 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-Google-Smtp-Source: AAOMgpeYMXpaYdOB4LKELJfMb9wvrPA55n9ddBrXvu6N8BPRyfYt6coI2KfPSqsUSrsQAIsuyuTkMg== X-Received: by 2002:a1c:17d4:: with SMTP id 203-v6mr2675549wmx.75.1530305564818; Fri, 29 Jun 2018 13:52:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/exit.c | 7 +++++++ 1 file changed, 7 insertions(+) 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" =20 +#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); } --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305906344153.56989497026518; Fri, 29 Jun 2018 13:58:26 -0700 (PDT) Received: from localhost ([::1]:44434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0TJ-0004Ju-IC for importer@patchew.org; Fri, 29 Jun 2018 16:58:25 -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) 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) 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-Google-Smtp-Source: AAOMgpe+GjEph0qIV3/31qlJZa4gZiWKqCzxM59Ar1SakC0D+QvFLBbtQ9ceWL+UdTND7QvOYis54w== X-Received: by 2002:a1c:647:: with SMTP id 68-v6mr2923717wmg.82.1530305563811; Fri, 29 Jun 2018 13:52:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- tests/docker/Makefile.include | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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=3D$(SRC_PATH)/tests/docker/docker.py TESTS ?=3D % IMAGES ?=3D % =20 +# This is used to filter targets from some docker builds +DOCKER_FILTER_TARGETS ?=3D + CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) =20 @@ -108,6 +111,12 @@ $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGE= S), \ ) \ ) =20 +# Special cases +# mingw/windows builds cannot build linux-user +docker-%-win32-cross: DOCKER_FILTER_TARGETS =3D %-linux-user +docker-%-win64-cross: DOCKER_FILTER_TARGETS =3D %-linux-user +docker-test-mingw@%: DOCKER_FILTER_TARGETS =3D %-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=3D$(NETWORK)),--net= =3Dnone) \ - -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ + -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(filter-out $(DOCKER_FILTER= _TARGETS),$(TARGET_LIST))) \ -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) \ -e SHOW_ENV=3D$(SHOW_ENV) \ @@ -195,7 +204,8 @@ docker-run: docker-qemu-src docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\= (.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) + @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) DOCKER_FILTER_TAR= GETS=3D$(DOCKER_FILTER_TARGETS) + =20 docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306071087532.7666291252513; Fri, 29 Jun 2018 14:01:11 -0700 (PDT) Received: from localhost ([::1]:44455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Vy-0008Mf-DD for importer@patchew.org; Fri, 29 Jun 2018 17:01:10 -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) 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) 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-Google-Smtp-Source: AAOMgpckpNq7vUfA++WvUZzqcwt1RTtA5ukvWBfQf6eM2yQM0akS6uP+Q2p88hCgGULF8Kd1eT0CyQ== X-Received: by 2002:a1c:96d3:: with SMTP id y202-v6mr2727995wmd.76.1530305566907; Fri, 29 Jun 2018 13:52:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 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-practice= s/#apt-get This fixes: $ make docker-image-ubuntu V=3D1 ./tests/docker/docker.py build qemu:ubuntu tests/docker/dockerfiles/ubunt= u.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/libg= les2-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/libg= les2-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=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/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 libncursesw= 5-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-de= v 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 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153030656482242.33835712968596; Fri, 29 Jun 2018 14:09:24 -0700 (PDT) Received: from localhost ([::1]:44507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0dw-0007aY-2D for importer@patchew.org; Fri, 29 Jun 2018 17:09:24 -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) 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) 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-Google-Smtp-Source: AAOMgpcjnYbj57vP1EzSAoU3wXZuXPzfM4jCRwmXDllB0PpxMqOypauis46FC65oEVTFOW+M5VFX8A== X-Received: by 2002:a1c:4291:: with SMTP id k17-v6mr2677285wmi.74.1530305568135; Fri, 29 Jun 2018 13:52:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Do not test the deprecated API versions (see cabd35840749d). Debian MXE MinGW cross images are already using SDL2. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/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 libncursesw= 5-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-de= v \ + libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \ libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdma= cm-dev libibverbs-dev \ libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-de= v libcurl4-gnutls-dev \ libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev li= bepoxy-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 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306054069541.7314076198909; Fri, 29 Jun 2018 14:00:54 -0700 (PDT) Received: from localhost ([::1]:44454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Vf-00087L-HW for importer@patchew.org; Fri, 29 Jun 2018 17:00:51 -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) 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) 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-Google-Smtp-Source: AAOMgpeGcs+zmHFFrFZ7cEyknoXBkB+pwsAHn/wJKStZIRJXs9Y7GHGcYtzfFh1mjj+7dMO9o5U99Q== X-Received: by 2002:adf:ae09:: with SMTP id x9-v6mr13116515wrc.19.1530305868273; Fri, 29 Jun 2018 13:57:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Using the duplicated same package is confusing. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian8-mxe.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/doc= kerfiles/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=3Dnoninteractive 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\ -f= 2) + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-= w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) =20 ENV PATH $PATH:/usr/lib/mxe/usr/bin/=20 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306629055990.9387594753555; Fri, 29 Jun 2018 14:10:29 -0700 (PDT) Received: from localhost ([::1]:44521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0ey-0008QE-BY for importer@patchew.org; Fri, 29 Jun 2018 17:10:28 -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) 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) 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-Google-Smtp-Source: AAOMgpcL0Vg/3QpsD8OW+U2DLfxzdhCGv5DVzO1yk7rZ1miJ8I6TI0zcbZd09yiIU8B39sP+XTGTUA== X-Received: by 2002:adf:92a5:: with SMTP id 34-v6mr14147406wrn.83.1530305864179; Fri, 29 Jun 2018 13:57:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES :=3D debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES :=3D debian8 debian9 debian8-mxe debian-ports d= ebian-sid DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -101,7 +103,7 @@ docker-image-travis: NOUSER=3D1 docker-image-tricore-cross: docker-image-debian9 =20 # 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) \ --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306414936207.0746892887198; Fri, 29 Jun 2018 14:06:54 -0700 (PDT) Received: from localhost ([::1]:44488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0bW-0005qO-6j for importer@patchew.org; Fri, 29 Jun 2018 17:06:54 -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) 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) 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-Google-Smtp-Source: AAOMgpeekBjY5NMI75NJRi6J2t863ysO0jKWoEOTEIz9VF80gFs9fdwjdC75NKEKJ9EvlPHcZRuyhg== X-Received: by 2002:a1c:58d5:: with SMTP id m204-v6mr2633833wmb.118.1530305569876; Fri, 29 Jun 2018 13:52:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We need to pass environment variables down to the debbootstrap.pre script to be able to specify build parameters. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 8 ++++++++ 1 file changed, 8 insertions(+) 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=3D"user", action=3D"store_true", help=3D"Add the current user to image's passwd= ") + parser.add_argument("--env", "-E", action=3D'append', nargs=3D1, + help=3D"Set FOO=3DBAR in envronment") parser.add_argument("tag", help=3D"Image Tag") parser.add_argument("dockerfile", @@ -302,6 +304,12 @@ class BuildCommand(SubCommand): dockerfile =3D open(args.dockerfile, "rb").read() tag =3D args.tag =20 + # Process env setting + if args.env: + for e in args.env: + (env, val) =3D e[0].split("=3D") + os.environ[env] =3D val + dkr =3D Docker() if "--no-cache" not in argv and \ dkr.image_matches_dockerfile(tag, dockerfile): --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15303067909601019.8811996578024; Fri, 29 Jun 2018 14:13:10 -0700 (PDT) Received: from localhost ([::1]:44545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0ha-0001kV-8z for importer@patchew.org; Fri, 29 Jun 2018 17:13:10 -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) 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) 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-Google-Smtp-Source: AAOMgpeOmUvdVlPUBSXFLdekt4JyN3WbARt9Kkd4/ixUCm9hgnli7XCMRygd+0xDiTDCxb85b/GoAg== X-Received: by 2002:a1c:6b51:: with SMTP id g78-v6mr2883272wmc.149.1530305866000; Fri, 29 Jun 2018 13:57:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This is best done with any child images that actually need it. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian-bootstrap.docker | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docke= r/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.l= ist -RUN apt-get update -RUN apt-get -y build-dep qemu --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306370523395.3118851708848; Fri, 29 Jun 2018 14:06:10 -0700 (PDT) Received: from localhost ([::1]:44487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0an-00055L-O7 for importer@patchew.org; Fri, 29 Jun 2018 17:06:09 -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) 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) 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-Google-Smtp-Source: AAOMgpcAg5k6EDwVG9MvPWLY0jzqymHma6ZjhYqOCUsE/yTy9uwjxek2Dg0w84KXq/pE+QMEGfQ/Dw== X-Received: by 2002:adf:9ed0:: with SMTP id b16-v6mr9996615wrf.170.1530305863431; Fri, 29 Jun 2018 13:57:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- tests/docker/docker.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 =3D os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _copy_with_mkdir(l, dest_dir, so_path) =20 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 =3D "debian-bootstrap" + df =3D os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read() --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306506462695.1279472401848; Fri, 29 Jun 2018 14:08:26 -0700 (PDT) Received: from localhost ([::1]:44502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0cz-0006qO-Mq for importer@patchew.org; Fri, 29 Jun 2018 17:08:25 -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) 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) 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-Google-Smtp-Source: AAOMgpcg0EpkvBe/KVkgc2nhBMZOmVMSInY3LIrQ5P1ocZKwqr8uaxWt9EmerBy0WjSGzOHOJ0jCPA== X-Received: by 2002:a5d:4503:: with SMTP id s3-v6mr13235042wrq.191.1530305866936; Fri, 29 Jun 2018 13:57:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- tests/docker/Makefile.include | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) 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 "$@" =3D docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; th= en \ - 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=3D$(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=3D$(EXECUTABLE)) \ + -E DEB_ARCH=3D${DEB_ARCH} -E DEB_TYPE=3D${DEB_TYPE}, \ + "BUILD","debian-$*-user (debootstrapped linux-user)") endif =20 # Enforce dependencies for composite images --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306198574447.8706545974261; Fri, 29 Jun 2018 14:03:18 -0700 (PDT) Received: from localhost ([::1]:44470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Y1-0001os-Pb for importer@patchew.org; Fri, 29 Jun 2018 17:03:17 -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) 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) 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-Google-Smtp-Source: AAOMgpd/bJmqt+uIk7uRsawqax7FYMA4furq2VtDFHO9o2bG2eQvIJo9w3bxsSAYys5Rtzr5pV1qJA== X-Received: by 2002:a1c:149:: with SMTP id 70-v6mr2943893wmb.2.1530305865074; Fri, 29 Jun 2018 13:57:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- 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.dock= er 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=3D1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 =20 +# 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-us= ery) +# 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 =3D powerpc +docker-image-debian-powerpc-user: DEB_TYPE =3D jessie +docker-image-debian-powerpc-user: EXECUTABLE =3D ${BUILD_DIR}/ppc-linux-us= er/qemu-ppc +DOCKER_USER_IMAGES +=3D 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/te= sts/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 --=20 2.17.1 From nobody Mon Feb 9 07:57:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530306357256499.39719867191616; Fri, 29 Jun 2018 14:05:57 -0700 (PDT) Received: from localhost ([::1]:44486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0aS-0004Ao-Hl for importer@patchew.org; Fri, 29 Jun 2018 17:05:48 -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) 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) 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-Google-Smtp-Source: AAOMgpdzx2G8S101nyTiTBx/Uh/JkcrHHIBI35tVLRbJ74irWLpwg6SOmaUtyLzZ9v+xUl+yw5eYpw== X-Received: by 2002:a1c:7a19:: with SMTP id v25-v6mr2581358wmc.81.1530305568927; Fri, 29 Jun 2018 13:52:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Use our new ability to use linux-user powered docker images to build ppc-softmmu. Signed-off-by: Alex Benn=C3=A9e --- .shippable.yml | 8 ++++++++ 1 file changed, 8 insertions(+) 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=3Dmips64el-softmmu,mips64el-linux-user - IMAGE=3Ddebian-ppc64el-cross TARGET_LIST=3Dppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user + include: + # Additional linux-user cross build + - pre_ci: + - ./configure --target-list=3Dppc-linux-user --static + - make -j$(($(getconf _NPROCESSORS_ONLN) + 1)) + - make docker-image-powerpc-user-cross + env: IMAGE=3Ddebian-image-powerpc-user-cross + TARGET_LIST=3Dppc-softmmu build: pre_ci: - make docker-image-${IMAGE} V=3D1 --=20 2.17.1