From patchwork Thu Jul 5 16:03:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141193 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2130348ljj; Thu, 5 Jul 2018 09:16:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf2sD7OTuTLOrE09UBOwXx6iSIJVjl6CVQMQvHnxMVBmewvQhnLftDf7DbA5T8J/TiqWXA0 X-Received: by 2002:a37:404c:: with SMTP id n73-v6mr5544082qka.250.1530807410084; Thu, 05 Jul 2018 09:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807410; cv=none; d=google.com; s=arc-20160816; b=hRc5gufYj8zLGk2qAJpyTqr4LE3FvNrE6KZce/Cq70Mmfhzj/cVSDGYN7rv3turlWw RU4jFz3BvJd3S+773rzHgTn0oN+mhu78qpHn72MGU3k5O4Da7CorpLH9PynW3SY99Dz4 i6TnUsITSK9vmVmBgWo9nv6GKJ73u/6r+QVNUozUygnVLPZQ/1bhpfy0t/jyZ67McWhj 23qj7pSGGJmKcVLpEofj58d+Y2hPgbJRMmu/fyCTNpPy4E1wZ+M+MLILhUE9lgqFYda2 uq1medtBebC7Q68QweQ6LcGnzoTdGDzE4BOlHXpIzomqbdUHJWSp7s3SrFJbDcidPY4q CWmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=ISUZRv3HWSePGBz+oNMbjFzXQUrh7gjJU/o92D04KghacMSL0iyYdOrNFJn7p0LEg/ txuU45SKMaE2jety3SqLZsbVe0s1NhDZ/gg6nfCePfQUKrTtXVKgD/jCcIvskFCIhDEu 734xpy/UPXZlc0aDetsNTmstTCvbXVILrGq4Jz+7+R8rDSPtlAQf0gESSFS/pBGxMXBT sZgzSKxLrGPEPfnWFfm50FV35hmWPoXE8ZOuVtf9MNqrN024xAK6umo+Of16V0rBoGae /q/AD9qFqqeJ5ZAGOzoPSkNYCrEOnOUbxGxHty3CBzL/eJtPqV5WNXn8UCZM4Oy7kuyQ SwZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R466C+3y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b4-v6si5973313qto.332.2018.07.05.09.16.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R466C+3y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6w5-0001jj-HH for patch@linaro.org; Thu, 05 Jul 2018 12:16:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jH-0008KP-8M for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jE-0007vz-O8 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:35 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:38656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jE-0007vL-F7 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:32 -0400 Received: by mail-wm0-x234.google.com with SMTP id 69-v6so11741927wmf.3 for ; Thu, 05 Jul 2018 09:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=R466C+3ytMqdY2pFpOp6rtOeE6sgBy4bcsk12lZ1ftbRi74/BUthOJauahr/4Dtuuc DcHdzzf5YWcTWdyOxlT3ol8C9HCB9/n4U3xC14ox8SAv4DyyagFFexq4akdlvlKwzDXX R9n81SUojkI8vZEVV0vu3qR56LBSF5iBvoumI= 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=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=Y6aaDFbPCaM6jHZIZGOOEYTEWkRl/FEoaFEjreFGR03pkP/qcprbgpj8FTRa7w8enL NUDrI37iN/VtTx/myIne3hfIoRDJSxWvCzVdD+JjTg0bLg6Y6AMJ9OAwWgDquxJgaQrb YlzTlLmDRw8E+kdigJZysEkBDr+GFHWgEgl4q9pFEtGsKnp4tXZO7WXQ3G0uI5sod2Pi wJeZKfj1WJhudCLaTpvkLHAYtmc9tM8n5nudMvSG/Bo4fp/qmvixQywYjYwRl0xLo9Yx 4As6XaVjC5JynDSnpLqceflCL7XbGYMgx0BmdiraEvmwkAV7ytKdX5TqFn4kq7+ijb51 VWxA== X-Gm-Message-State: APt69E0+aDLP+I1TqbBjf7fFZtNjVKgm4Av9KC9aLUi0H1HHw7KfniWS 6cDhXt8a8Sv0BgddwHdu/AV2og== X-Received: by 2002:a1c:ae8d:: with SMTP id x135-v6mr4361396wme.20.1530806611225; Thu, 05 Jul 2018 09:03:31 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y129-v6sm7364561wmy.4.2018.07.05.09.03.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:29 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6DA6A3E0229; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:10 +0100 Message-Id: <20180705160329.30386-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PULL v3 01/20] Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST" 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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This reverts commit 208ecb3e1acc8d55dab49fdf721a86d513691688. This was causing problems by making DEF_TARGET_LIST pointless and having to jump through hoops to build on mingw with a dully enabled config. This includes a change to fix the per-guest TCG test probe which was added after 208ecb3 and used TARGET_LIST. Signed-off-by: Alex Bennée Cc: Paolo Bonzini -- 2.17.1 diff --git a/Makefile b/Makefile index 7ed9cc4a21..39fd4c0546 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,8 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -365,8 +365,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -469,7 +469,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -513,7 +513,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) -ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -770,7 +770,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 - for d in $(TARGET_LIST); do \ + for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -871,7 +871,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_LIST); do \ + for d in $(TARGET_DIRS); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1066,9 +1066,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_LIST), \ + @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_LIST), \ + $(foreach t, $(TARGET_DIRS), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index b99ebdde24..2a7796ea80 100755 --- a/configure +++ b/configure @@ -6212,7 +6212,7 @@ qemu_version=$(head $source_path/VERSION) echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -echo "TARGET_LIST=$target_list" >> $config_host_mak +echo "TARGET_DIRS=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak fi diff --git a/scripts/create_config b/scripts/create_config index 58948a67a4..d727e5e36e 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_LIST=*) + TARGET_DIRS=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 1affc49ca3..0c0f9509f5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -874,7 +874,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) @@ -938,14 +938,14 @@ check-report.html: check-report.xml # Per guest TCG tests -LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_LIST)) +LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_DIRS)) BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build -$(foreach PROBE_TARGET,$(TARGET_LIST), \ +$(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.probe) \ $(if $(DOCKER_PREREQ), \ $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ)))) From patchwork Thu Jul 5 16:03:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141189 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2118582ljj; Thu, 5 Jul 2018 09:06:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc0vpyCSyz/41gs1c+QzqQ4ls4fuTxpn/Gn/J3x6MjEraRgjsI1Rc+zLOnznjM2MQm9zzng X-Received: by 2002:a0c:c18d:: with SMTP id n13-v6mr5700433qvh.7.1530806770435; Thu, 05 Jul 2018 09:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530806770; cv=none; d=google.com; s=arc-20160816; b=Em7V84q9QfZs6aO9GdAE8VHay9R8TTKPI/YF4MaMevCum/4KOmFLjEqwP7+NjojDrt 02XoeFt3CduD2phP6mymW2sYeglJKs19vsa12qUUmxpDajjzvsf8kTMUHY5cfPKt8kld bJDCFvRzdWLLgN9cAlikhL/KR50lvCx1sBgxTrqQq2S6T4BA3DHQj9v125hkrJ9uYMup 6TMjPOtEM5Z7lka1aQWJx1zNa/ZQUAUNxPbchmk5ZbZqTcR6XnZE7IxjUwxkDquJXXdR XMOf0hzt6672HZYwYreFIciSpb0Gryh/8HTLgfgEk81n0k0P3xMm2we39AkypdKgWoHB jJEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=OINvF8jQKbDUk3fkIedOmqruDmJsJ4CoQTmfcBSQS6xgyQQr0AqoReObVafte0Zjyg rSWUvKo+AQ8U2INAEWsSmKVw2LGWyJjIHRHmlGELzIxyDSFRmuG2G8b71HyXQCyHZYm6 ZbsLX5lTByIZHPKdowQDyqC/r3pUlpfwbeniHWU9SxuTgG+2ZhK07yF7Z31rX+pRMuxM mzmKtj9HHZ2pwy535SOfnS3zlI1x4mKn+IdywuoHh3hAk4/BuBmwTr7LMap2CgM6rLww oY9+nNygOvJ1bSHn5bUujESlGF5ctj2sfBCUQtO+/JsEnfVlq/DoLOCF2K9DwgyY/T5c 3Mvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BCSmfvpo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v7-v6si5850827qve.239.2018.07.05.09.06.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BCSmfvpo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6ll-0001jM-PG for patch@linaro.org; Thu, 05 Jul 2018 12:06:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jH-0008KQ-8i for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jF-0007wL-8j for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:35 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:51004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jF-0007vj-1x for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:33 -0400 Received: by mail-wm0-x229.google.com with SMTP id v25-v6so12156532wmc.0 for ; Thu, 05 Jul 2018 09:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=BCSmfvpoYXq52Wy2BuGq8uJ/lBLnuxOB4KPAgrShsZDYwSUpsLt5wlEyYtdOcFFJHI aYeiZs8vMrsoulRl+FpSbzslq59RcQVho4dU/CYWSSb1Nyv8990x9yqDg2YyELaGjF3Z zGACjlgVl8n1c+ZilRSZa85wykoMhVd3ZeQjY= 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=dU3kq5psUPJEFUoqHyC++6Tir0Uw7eOGFEoPWFW0FRU=; b=ottO1rYihAzg449yy0zmP15bc0qEXEOBdj2cNv6adSy2L052NRm+6ZXLkPVti0m/Qu CpiWMIs3fTDV3C65uW7vFW6NayMTNzvAG2K/Xt4ZB1JWccRlGLdWCD8DR2X8/ZUi5eZZ KEG9uAxzz7pEebWbC9yW5mXxLoKY8Gp9jTpZ8BwR0PEQQSwEgSnStz4eogMgVDPX14wg 3/sarvLcQjM+gjQIClegGfg15RQDzl8eoqA0gnwGn/vBZ1mt74nBn4f1CbsysAMFqf6j pyi8pdnoPddMPMzpaGZAFhbGhjfmX2yIbv6wAmnM4xKwBrh6EXXWzLH/vx8Y+WXPDQxF xihw== X-Gm-Message-State: APt69E0efhoZfiViMyQQ+04cgMUC4Xb9Bb2OW69q2cLgdZic3VIj/Jlg UnUPxQiBzqwOO5zpiBxB0/hRgA== X-Received: by 2002:a1c:9290:: with SMTP id u138-v6mr4839918wmd.52.1530806611958; Thu, 05 Jul 2018 09:03:31 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j9-v6sm8546416wrr.52.2018.07.05.09.03.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:29 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 800B03E0684; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:11 +0100 Message-Id: <20180705160329.30386-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PULL v3 02/20] travis: do not waste time cloning unused submodules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Builds only require: - dtc - keycodemapdb - capstone Signed-off-by: Philippe Mathieu-Daudé [AJB: drop wget cache] Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index bd66c18fed..134d5331fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,8 +66,7 @@ git: before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive + - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - ./configure ${CONFIG} || { cat config.log && exit 1; } script: From patchwork Thu Jul 5 16:03:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141195 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2132997ljj; Thu, 5 Jul 2018 09:19:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcj6pr1z+h0YoM8XkXZ4xwjp0JdTL99SQ03CX66bQNQgZX9Lc1zJRocQF5nMZSGAW12npel X-Received: by 2002:a37:82c7:: with SMTP id e190-v6mr5497155qkd.313.1530807569156; Thu, 05 Jul 2018 09:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807569; cv=none; d=google.com; s=arc-20160816; b=OEIE7jHSDSpLzUnkKL3N1YsYCkqC7yghZy16/4gLk1jWWkIx/PTm/UfJzHT8jzR8ws ENorNLRQlL6Psnp+Jq2hlsDkIFado8QsBoMEE0b/198n4hOAk6BsLz8/nOR8rVf0p1eQ LbelKHj+vtev6QysssM2EZbt10zs0HEsmeArF69Ncae4lVMjwbt2F3FJQj/2GUe4zaFo FMOmDH2u4WFeCuettgJkmj6is8MHPOn+cfEi/1xgp7+yc+lgxjMefHC11r67HEWCnhLe FXW69OCcq6zeDmB7y1TmzGqFe6zOSsUyQb8MQn1dGu9BIoSzEcfiic5DE/Hew4jfKcB8 mfOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=Ok/f6AbgfFjZwXo/j0C68Ed8fyx4e8D9flYrAqIJZasitDRYxBdmvuoJ4rNGI0gx1N nlYFEvV9mbcpRps0gNaGJgLAIQELDb2MIYcuqlquTWvhHU4GyCJc/Yl+XYWLytGVmO4n gj+F4CToypLfEDdtgcVmJEYnziBb5+NBIUsbwvPVliERnUAzghdD6tlq7dRhj6BSqC3S j8xFObLGm78Yy6fJHVztBw2+ja7ZTJ3GCehLt2iC8N7v41BexBgByXhcz1gE49KOEZzn i4elDG5tcyUJv/PmiuoEYYIga19Wq03MOW6cxYsxKowuziShKGLnrv8+Z5R7OMeNCkfp bvLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fUzCNp6P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t34-v6si380033qth.151.2018.07.05.09.19.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fUzCNp6P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6ye-0004UU-Hy for patch@linaro.org; Thu, 05 Jul 2018 12:19:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jH-0008KR-8u for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jG-0007ww-6f for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:35 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35363) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jF-0007wP-Vm for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:34 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h40-v6so1464725wrh.2 for ; Thu, 05 Jul 2018 09:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=fUzCNp6PAzvDg7qv2VfuD/FKs4wf3kjic2wY3x/Mpp7ytcVeM2FlW/BCy+3nkQqAmI qd9QPlf1fzOiuYAlE2u1+xJbHH/jZlpp3jMbAbQurlcvcCOpfWmU6d/caCfuKNg6Or6Z /dQuh7FzcH/DE40IwqN7LbW+64AlFzG6frtZ4= 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=8ZJIkp5peP8x948t3evAemzrXu2WEsnvEGJe0RgWHkw=; b=mOHOs0m8DFDTXolaxhuvgavPLyf2ky0RJzl1IWhyNeTryI0lRt5671SVr0qJG7TYi1 sgvknaxQKFdhndNbAgrESV+Q74/ia6Le5GpRjUxcd1WUD3J2oHTsWan0hwsDkeo6zudS wiKX/mF4CKrul+hYA+DWVwkP/zgvhGk3KvBTb0cGMX/0Q4fHNzivFBD5gGku/Y6QShlQ Ka/XBgv3ouLO1WbXV+y4efv5Xf+ejNmaXk0/UKpr4EboUdLbypJZfez05TmGqJhn7avs I5JS8VwLoQxHM9vnImuFwVW2t2DzOVdfZNV1taMZEJ8TEG9OXRKWk8J1J2ANClTvqnp8 aMsA== X-Gm-Message-State: APt69E27xUNpbmnrQtlP7aCLMc5s1DQHSUCpCLkkf7b7FRVZJRVJ1VV3 yJxSE02/G/cU0g2FarmkOEQBgiughls= X-Received: by 2002:adf:9025:: with SMTP id h34-v6mr5431853wrh.123.1530806612845; Thu, 05 Jul 2018 09:03:32 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h2-v6sm8792744wmd.0.2018.07.05.09.03.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9260F3E06A6; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:12 +0100 Message-Id: <20180705160329.30386-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL v3 03/20] travis: test out-of-tree builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Force one config to build 'out-of-tree' (object files and executables are created in a tree outside the project source code). Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 134d5331fe..32188d51f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,8 @@ notifications: on_failure: always env: global: + - SRC_DIR="." + - BUILD_DIR="." - TEST_CMD="make check" - MAKEFLAGS="-j3" matrix: @@ -68,11 +70,15 @@ before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi - git submodule update --init --recursive capstone dtc ui/keycodemapdb before_script: - - ./configure ${CONFIG} || { cat config.log && exit 1; } + - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} + - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: + # Test out-of-tree builds + - env: CONFIG="--enable-debug --enable-debug-tcg" + BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG="--disable-system" compiler: clang From patchwork Thu Jul 5 16:03:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141196 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2133615ljj; Thu, 5 Jul 2018 09:20:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd1nXdWgr1aOsj5Cg1mZ7JmYt5nSb8ELd9EP/g8qL23Ihs3gl7BCegk4QAOL3qM83ixx89s X-Received: by 2002:a37:5c01:: with SMTP id q1-v6mr5316136qkb.361.1530807606337; Thu, 05 Jul 2018 09:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807606; cv=none; d=google.com; s=arc-20160816; b=Cu6gYnbWd6UkIGXyAH0R74F/PIjRX/nKk8rg32bwroHTXftFCVVU988jCmRMTNetfm rx6D04E09Ma7Bpfjz3a1LL0vDeOTTLrb/zmCVPwRbYc1+slrhHc5fmOKx0HFwNiEXTDN YkFm5GFZBdo2g2Ns1UOPJ4qLvqn6ZEowMUT8zXVLoAhmUFWcO8TuwXZHlb8aHjRrzKu0 AzX2asr2TX2cfnzHfit15Fc2AkPWl2zkAFSgM6ljxRwueZasU9gcrwG45+H5OeIDuqhb avRK2ombq0IrEfvReD3HJ73EMo4uL1rTjc+UDMqqw/0pSO0iBGV/EugAQyhP8/fD2MUW cPPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=LfGnZuECrY3r6xxBgyILM045lCBDz+C6BvDqvvVhXK0=; b=W0NhRJZHck6HNoXS+zSS53jqp1bwV76Gw6i2GA+rDM1Hh8qEgX2clpLV+GtXuYojz8 13NIU3qd6HhlRztjZRsyiJSJJg2bKuc5cl+kJKUXdnvM+8roA13NzDj9yNVY2zND07xH i+5jfVVcKUc0J4ltt8MR6cpf3dKDb3vcX6j3JvwiIeoBMQXXJr0BkCkVav9a7Ep/MiJ8 l5MIFSXt3ikPJw3k400JtcwiKExVbeZNYAEsex+pix0dVSFNoM9T1/iVsaStoKQxGRhw 6ZL5l+fi/aNcLkbeffi1hClI4cvALc+chamCwE2RKNh9gqUnsQNpK3x6IgCsMWxssrZP KXzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M55+j2wg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r32-v6si1061553qtr.41.2018.07.05.09.20.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:20:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M55+j2wg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6zF-0004B6-KY for patch@linaro.org; Thu, 05 Jul 2018 12:20:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jI-0008LV-HC for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jH-0007xP-2K for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:36 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:52415) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jG-0007x2-Rs for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:34 -0400 Received: by mail-wm0-x22c.google.com with SMTP id w16-v6so12070329wmc.2 for ; Thu, 05 Jul 2018 09:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LfGnZuECrY3r6xxBgyILM045lCBDz+C6BvDqvvVhXK0=; b=M55+j2wgBpRgVJf/RtsO56BfVbvz1qVwLUXNzIYEXQ8yrplkGtWfWvVVxRnMtqc2Za PjIsebQ1yvrhANL9I4ziXvHc2BoaH6dXzVleLyeafSRlqeYiSDFGo4uUqJN1XrWR+pgy bOa8xMJu7nmuaVUJYbm+xf1QkDqNo9PXNmD+4= 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=LfGnZuECrY3r6xxBgyILM045lCBDz+C6BvDqvvVhXK0=; b=cfCG2SjW5h/ZmTZhP1c5HEEsnuRfZjwBrpmsQ9O4jrYgYz6wOIcjCmywT9L9LuntzC m/LRelEKKfwwK9N0y6EQwGslHvgzK//Z+iDanKlORPJVzNbNNGlS/GMHPdAZajTe50bS L/BW7sH/DzpSK+Ppi+Jd9MXSUqQzt8n1AqBhn6o5/4JurXD8DDE/eOHihxZTRgx2j96O 4oOe1wKelvtZ7R1HyM4ju7iVVjmB9tn84TJVpsAznmrjxIo21JoXfDO5lyrIJu60zbz5 VPDrxuF1cCKbYIJ26KgarmyHsG046DzRIWraroJdHh5+ZiOeyDgvOZ67sAV/F5eoAEIL yysQ== X-Gm-Message-State: APt69E2v4GnGOyrmG5cVzr/E0gF/VhJTpYMdUplrYuVfOkKsoyLQ8Bju 2cU5ugwKZmE8vSrGgDRHgTjatw== X-Received: by 2002:a1c:6902:: with SMTP id e2-v6mr4897442wmc.95.1530806613693; Thu, 05 Jul 2018 09:03:33 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j131-v6sm9367820wmb.25.2018.07.05.09.03.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A61163E06DE; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:13 +0100 Message-Id: <20180705160329.30386-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL v3 04/20] build-system: remove per-test GCOV reporting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I'm not entirely sure who's using this information and certainly in a CI environment it just washes over as additional noise. Later patches will provide new reporting options so a user who wants to analyse individual tests will be able to use that to get the information. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index f33e5a8423..66ef219f69 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -158,12 +158,11 @@ rarely used. See "QEMU iotests" section below for more information. GCC gcov support ---------------- -``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the -tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. -Then run ``make check`` as usual. There will be additional ``gcov`` output as -the testing goes on, showing the test coverage percentage numbers per analyzed -source file. More detailed reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the ``gcov`` +``gcov`` is a GCC tool to analyze the testing coverage by +instrumenting the tested code. To use it, configure QEMU with +``--enable-gcov`` option and build. Then run ``make check`` as usual. +Reports can be obtained by running ``gcov`` command on the output +files under ``$build_dir/tests/``, please read the ``gcov`` documentation for more information. QEMU iotests diff --git a/tests/Makefile.include b/tests/Makefile.include index 0c0f9509f5..a49282704e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -897,26 +897,16 @@ GCOV_OPTIONS = -n $(if $(V),-f,) .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-softmmu $(check-qtest-y) - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF) \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER","$@") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) .PHONY: $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)) $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)): check-%: % - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command, \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER","$*") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) # gtester tests with XML output From patchwork Thu Jul 5 16:03:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141197 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2134218ljj; Thu, 5 Jul 2018 09:20:40 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdHXq1WP1Dr5oXgEr9ONhJxrPN8Y44o6lrctoILbH/5R78bUN0PwDSXCM1TDhS/KCuy797N X-Received: by 2002:ae9:c114:: with SMTP id z20-v6mr5853346qki.225.1530807640722; Thu, 05 Jul 2018 09:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807640; cv=none; d=google.com; s=arc-20160816; b=0E7piKbm/YDbWku5skVh0Y0YazR/K0CHwnXgAmEofVu8sLeMXgvflN9urtj35Dxs6G q5V65E37N4ZujPPqTojJZoniH7Q6xjbuVjXc8p1nA8It2WnOUaoj3+Aap1RZ7N2WXT99 BkiLlLUNVlsa/VSxNs/wiUuPfjPSPCYEls8R3/dlSHVNODXEUy5b1Ktd0Pbfdfl//WFm Uz40WZu3Ih9EHweb7lFyGYGvtvJVDmoXXIuctHNs0/D6IbwLOTUNTWZ/X8hXgiBPgOnl X8MAzOKHQeSM3cYq+2l4MRHhL6CdkChaLbBb3YnVe3ut8aWsSY+XRIUxzzEB9qW1gS78 N13g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=f/4JUO7UN2WhBIj4D/+eB2o8jxjqXFgEUxLfOc+/FHd/SfIEHIJxwdYqv0/V1Mjh5t PdYKkak/gcWaK5TUKQ+iq19ylLe7/QhFIj3eHVBYbM/uXEn9ejvHviqc8PZPbigBZDmk P7tQQypjDtFknlLdunoGaPD63UE12+wrQb0DQXynCcpAIaIVA1vy1t/HEQ8Y+f/KPmYH Iu1K5Ny2aydI6Vkm413CA4P7Annkm0WPNM62l0YCkvgrei0CClLkzyuOQNByXftwLn3S xut1JraonQFZn8nHrZf7umL9LyV4kovlpU0juoTWEHC7jN1IrE+v3gGXPyCPCKYTZoU1 zgpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IN0cUzMM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 33-v6si2152776qkz.366.2018.07.05.09.20.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:20:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IN0cUzMM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6zo-0005PE-1m for patch@linaro.org; Thu, 05 Jul 2018 12:20:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jI-0008Lc-M8 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jH-0007yE-O5 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:36 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:54424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jH-0007xI-HO for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:35 -0400 Received: by mail-wm0-x233.google.com with SMTP id i139-v6so12061384wmf.4 for ; Thu, 05 Jul 2018 09:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=IN0cUzMMn5uk5TS9Q1/OumUNbMuyWdLrEmuGVe3GaEEsEG1jBwVfNriNz3ExNNiRsv vTF1dNaqkbkXmUYBHR5H0/VT7tNLTlwSKlPmFwHx19sw8ifpUfqp7XO4PbXo9nAixWFG WXVH7wDP3L0q17NJ6R8cqUyNVF5vExCRGool0= 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=+MykUc49ZuBBKYZS74ihd7UuNP3+o35TThPInQ61l7Q=; b=GTUcS6RQzHnGyOfKqg1+Ycv0+7iO1iJiakVenMGAMc2QJiqmdApY72OOFmah0pHRa2 ZtmmApipDDVz++0g28OQbuMjwIdBlkmzWDVHyZXeCXkWaVT6CjAJhsCmbgNh+hUMyYTo Rg5SuGvKNhJYe5w+/cLeKbggIIRy0LFY0lPHSnlpCdeBpu4JB9pv/k2EJWuzDN7+F/Eh BYASdlRsAiysrCA6oWtV+Dj7IL77pYRJbKe0zLHl1dEQt7bDsobbIfw7Pk2nxgaRIakf thhVKB84cAc7qL7rOQX0i2p0uqP77TQOw5NBtyqzFs1HoCvy2I9Kgz0SMKpgccYpMnyF GZjA== X-Gm-Message-State: APt69E0on7Syp8RaXGCIkCfiksmHEwT/NQv5QQFDhpSmDw6yabPp082w yiGkuD2TBThuQ67/G2iEEdTfy21/1nw= X-Received: by 2002:adf:af27:: with SMTP id z36-v6mr4791629wrc.59.1530806614425; Thu, 05 Jul 2018 09:03:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u13-v6sm8284025wri.72.2018.07.05.09.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:32 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B7E0D3E075D; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:14 +0100 Message-Id: <20180705160329.30386-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL v3 05/20] .gitignore: add .gcov files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are temporary files generated on gcov runs and shouldn't be included in the source tree. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.gitignore b/.gitignore index 9da3b3e626..5668d02782 100644 --- a/.gitignore +++ b/.gitignore @@ -155,6 +155,7 @@ .sdk *.gcda *.gcno +*.gcov /pc-bios/bios-pq/status /pc-bios/vgabios-pq/status /pc-bios/optionrom/linuxboot.asm From patchwork Thu Jul 5 16:03:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141203 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2141997ljj; Thu, 5 Jul 2018 09:28:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcu9yC4t8CN2AtfYZq9gnJAprEd8Pk/rFoEFap3tgfz/sPGdw2AazlHdBBstzO9bu+qWL2D X-Received: by 2002:a37:6c87:: with SMTP id h129-v6mr276822qkc.280.1530808126122; Thu, 05 Jul 2018 09:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808126; cv=none; d=google.com; s=arc-20160816; b=PD0bHrqVEHnCdSVMFIPitZDzkwf7pN+FL6EK9/9yWtMlQfBnUHyZTEG2m5Wf2Yqq4Q dao1UjS/g0T694kARH36+e2Q9J/4k5qswIG0Vxc1T1tJwV63vaNu7864MIf2EtdtdNx4 Klr6kmzLuDuGPNvI3ElPjK1s+bcrmIvZSt85/n5BwmKK346bxPfGDnEeRSiHW2P2qbJ9 Xk8GO4U6OwGzssuzEpU0UytuEid/NkMF4gYN7cf2JIvemYfKqIjGfLLtDMuSLPv00FzA CEdaR8Nnsny34qtmGPMnT1r9jRCeue51CxG+WJ0L1OehTJsscZwcPEWE5puvdWAVqh4t Ukwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=dib9EwdlTcz+PozYC4EUBtSYeCy3XDOfcF1GuBfMHmW5DkB8RxsD78UYcEcQPg4O1v 8yoAanorLbqHxjJujXCaVBat7u4aOWRRW8cO/EoxdClKgSj4bGUCorgfniNSRaCssqX/ fbRURyq4KVvxZhzmpnhlGrXNUJ2eqokKsxTHajDNo2uTNcX5P4IMVCDIOiKKBs00FODR AU/p8YJ8hvFk6Id7DxUHrMNphkpcNGOYJp+13mJlcPRGMESPNknG/j2nUkzlhKgJGnWf 1bHMsB4CvKY2PXTITQVA6SkoMhPzuvO2ZH1z275hslec6Xx1wZmeOxVKQEi0QWK5p+Y+ h7pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J7Orwoil; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o8-v6si6097791qte.197.2018.07.05.09.28.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J7Orwoil; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb77d-0002rC-LZ for patch@linaro.org; Thu, 05 Jul 2018 12:28:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jK-0008NO-JZ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jJ-0007zf-GX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:38 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:36659) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jJ-0007yu-8n for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:37 -0400 Received: by mail-wm0-x233.google.com with SMTP id s14-v6so11817888wmc.1 for ; Thu, 05 Jul 2018 09:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=J7OrwoilGQnSHoigN1/ha7s56kKYMsRlIwSbwSO6S3ujnRcO1Y9ozgrIGk+TLdjL/f kMPAHQaUsoXKzsHUopuigEsRJoXWC/TXUSjZ+vuLUBQyiNx+5pomff+Qr7HQBvAfHSdm 7pQG3kIIDSbWz5W4QwHTfMmiUBbyKIT6JIqQ4= 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=gpl/6hMFpV7z7OvIAzMr3CHr7aFmzLYlBvnM1evaF9M=; b=NtK8VfW4OxkhmkNlubJVBpPkDXVY0zgtQJ8eW8o9PF1n0ldk5JiGhLmR7VId2TDgGu 876HcbXaEbGLbaJCiSD7JKEejq8bLk17CyU1YjDqCI+Bi2x/QnhqlNd4vky1m3YGjnyd 31ZiKUTxeluJmnZ6GeDm+yaR/DnVUr22toFgIKBd4lrwKhNValKiMz1jpq1OqK9bHRqO 1lZHKxB4OBHiQsr9urA64Mfk+7hRBHAy/0xwDwiZEReMmLoRqrAd7+7tmVkvkPdbmVg7 /auFj0naJ34cqCUnTxiRgnECzNz3BkZh6rA7ss9rIEb83+s9fCxEk5Q6C6OaJw8pvF92 AUWQ== X-Gm-Message-State: APt69E1uMdhnp1NzSpaDPujrk+nplFMkFr0thR9yDVY6C+AyhGWHycTJ cQFmT2gyJ259eZetsl1pOtT/tw== X-Received: by 2002:a1c:c3c6:: with SMTP id t189-v6mr4231836wmf.59.1530806616246; Thu, 05 Jul 2018 09:03:36 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v9-v6sm9539731wrn.97.2018.07.05.09.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:32 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C9E0C3E0775; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:15 +0100 Message-Id: <20180705160329.30386-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL v3 06/20] docker: add gcovr to travis image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Useful for debugging if nothing else as the gcovr on the Travis images are a little old. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index c5ad39b533..03ebfb0ef2 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin From patchwork Thu Jul 5 16:03:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141190 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2124670ljj; Thu, 5 Jul 2018 09:11:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdOwJzkanS07uJFrX2nhMlE6L7BU5v1A98q3wBjCaukblMECJPtw5xihAcNb11ooa+CxvdO X-Received: by 2002:a0c:f101:: with SMTP id i1-v6mr5705807qvl.67.1530807089760; Thu, 05 Jul 2018 09:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807089; cv=none; d=google.com; s=arc-20160816; b=DiaEs+RqRsgpDR2e5x464UiUrqqYaF2Kvavlvk0Vh/sEyOVeuJAGXSB2RVJ+iYOVVg 6ticox6lhj5Xw3uMyxO5Uzd0x9hdQdtN9SuYD1gRoQ3rIHcsYJgzzZgciUClubviqJII M6+N/dZIOpKwwu2GtPaRQ511Ab5Kt1LfFPxQMIlIB5TWG4/lzyKf57R/VJMAUneG/wur GUIaYvL3EA8TNFyA9Odm1t17pF0FVbsqOE7rHFKziX9rXnfmj0/R3ohVCg6pBfcV0i/h LITq/ZPgJ6mxumXbPnLuhgUBSNb6gdQmvU3Zw0DtkjmFWWu+lQaxwTlS+ZMcqK731hav ICHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=QhVSSCsCpcmhhZfvuYE8CVZNq2NEJx/PPHHEhuPMxLA=; b=pJLwyBCMdqT9Crwc8q1fUpDimNrvdetOmOrhuKjYpDzoozta2ZKqWm878DHMhJj+dl hgxNFA5AZ1o6MudN7HQwARPTfbocs0z76EbYdaNTH+qBvN2uZOMIuTJVCNM/rLLLYjuF oAkT6CyX6Y/WFzovsCtBhoxZvhRBc/CBQTvZzPKbMLeeXp0RAa4DbiKFVsLgIruUBKI6 hgAymQtj7Ew6QiRbgcMeGlCHlKNHYP0ahdtbDHhRV5ZthbRXf8TDSow64N5LFeQQuHO+ YxZIBjVZLMlh9WB/69ZzIbVfVoa6zhbuZHjsOeVMp/Pw1TOK/hmqCKC84LZ4NHzEDdTc OGsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fsywEDr8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e35-v6si6409322qvd.129.2018.07.05.09.11.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:11:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fsywEDr8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6qv-0005Sa-7n for patch@linaro.org; Thu, 05 Jul 2018 12:11:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jL-0008Ne-SF for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jK-00080W-MW for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:39 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:36650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jK-0007zq-GN for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:38 -0400 Received: by mail-wm0-x229.google.com with SMTP id s14-v6so11817964wmc.1 for ; Thu, 05 Jul 2018 09:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QhVSSCsCpcmhhZfvuYE8CVZNq2NEJx/PPHHEhuPMxLA=; b=fsywEDr8VECI1wwiX9klI13gLv+uucTBFaCev7Jujuu5aflREZ4vNK+/rBIMhs6RTW Sjslrcxvb2SSv9SYO/lwZd7vR/1VEUI/GMso3mRkG81NxwO7abapf9i6ER0UaWfo23iP pTyrRjV2bM61gdAIhkSDMo+xqzRGV/vPdHdI4= 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=QhVSSCsCpcmhhZfvuYE8CVZNq2NEJx/PPHHEhuPMxLA=; b=rwdCj3yEC5zFjvucnbhXIPVebu2yCHieCt1PnDRgXIgLojpTrEaTcBQ2JSBmrJZX98 rnO11/rRiw8LXl2soCwj6YV3Lv37tFwYWXHPdHfCEccS8HgN7uvm4qJjt49exA86iqlL jsYQx2NErILuuCZkA+yvpXLJ4tOFYbV/0UeozjvwcupQqzRCvgAEhnzxTHmKvWRGhOxa e3YwPzRFnl2e4Id4Kf0Zmb4j9DaZ92irogKmQ7uHymGtLKtp5aBpHNt7nsaeGFTt2HNC iEVZpaybvPZaNiBXEtFqEYJc7GQ+bKqfAZni+P3XQuoIoCtB21kZ5SMSOpHjiGp3zN5P oVmw== X-Gm-Message-State: APt69E2GAqnpP477LIcR4vAQvsL3UBIAObh0HeYa6yuPei1aiqOWVnv1 yGxtxCYCdE18JmDuU2UZvuTWwA== X-Received: by 2002:a1c:f513:: with SMTP id t19-v6mr4854127wmh.50.1530806617177; Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u7-v6sm12987851wmd.3.2018.07.05.09.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:32 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E01FE3E07D1; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:16 +0100 Message-Id: <20180705160329.30386-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PULL v3 07/20] travis: add gcovr summary for GCOV build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This gives a more useful summary, sorted by descending % coverage, after the tests have run. The final numbers will give an idea if our coverage is getting better or worse. To keep the width sane we need to post process the file that the old gcovr tool generates. This is done with a mix of sed, awk and column in the scripts/coverage-summary.sh script. As quite a lot of lines don't get covered at all we filter out all the 0% lines. If the file doesn't appear it is not being exercised. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 32188d51f1..95be6ec59f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ addons: - libvte-2.90-dev - sparse - uuid-dev + - gcovr # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu # to prevent IRC notifications from forks. This was created using: @@ -86,6 +87,8 @@ matrix: compiler: clang # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + after_success: + - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" diff --git a/MAINTAINERS b/MAINTAINERS index 6630d691d1..6a13f70f99 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2166,6 +2166,7 @@ R: Philippe Mathieu-Daudé L: qemu-devel@nongnu.org S: Maintained F: .travis.yml +F: scripts/travis/ F: .shippable.yml F: tests/docker/ F: tests/vm/ diff --git a/scripts/travis/coverage-summary.sh b/scripts/travis/coverage-summary.sh new file mode 100755 index 0000000000..d7086cf9ca --- /dev/null +++ b/scripts/travis/coverage-summary.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# +# Author: Alex Bennée +# +# Summerise the state of code coverage with gcovr and tweak the output +# to be more sane on Travis hosts. As we expect to be executed on a +# throw away CI instance we do spam temp files all over the shop. You +# most likely don't want to execute this script but just call gcovr +# directly. See also "make coverage-report" +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. + +# first generate the coverage report +gcovr -p -o raw-report.txt + +# strip the full-path and line markers +sed s@$PWD\/@@ raw-report.txt | sed s/[0-9]\*[,-]//g > simplified.txt + +# reflow lines that got split +awk '/.[ch]$/ { printf("%s", $0); next } 1' simplified.txt > rejoined.txt + +# columnify +column -t rejoined.txt > final.txt + +# and dump, stripping out 0% coverage +grep -v "0%" final.txt From patchwork Thu Jul 5 16:03:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141200 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2138596ljj; Thu, 5 Jul 2018 09:25:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcqYuD3NQ4YSJCHHCmEjng/LTGwJqHLRfTKqzstOBGzQq/FFvviDowHZQr+OCIh0RBjF5Qo X-Received: by 2002:a0c:d21d:: with SMTP id m29-v6mr5767137qvh.86.1530807910471; Thu, 05 Jul 2018 09:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807910; cv=none; d=google.com; s=arc-20160816; b=TTwH1DHV4Yil/oSlRCxQjXjI3oqwSHiwaYmKkuZWZT0c4f0zqPQI0gtsOXT9sv+fDL GddOck611/OOiqTrzT/RbaDEJ77Cbi0zJ4JA+8IpFi/1jvQ8i7H/Y67kGNIW0fvZPxdx zTA1bINSWpzuYVvfUZuZdn4XKhxrpRbAou+xAf15J8H0US3p1sCzeLilFLKW2MMGDAWf hyhzPurNy7stUQBnW7Ym6eeMp+9Cq+Dbigd3JFdPbHL1qezuezXKRLuO51sWD0DPBQJl W5kJxtEgX0SxES45aDSQB53np61CYrhYEuD+CTHngubDJ3KND9xPuDbakuWrNlJ0ou66 zAEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=NnkXcRkwEzWiYqjh2Rik4I5Vm/tpitgUCIRXhfy8/ts=; b=wUWB6iBEY7Dopr4ayfR//o5uGUO3jcLIlpvy758gUNOhkvo1cGTXY9ODIK/KsElXwY oVhlcWbCaSmE3BgUWx0Pa24R70vHAWLH/ba5phScnv8lWz2hlrqchNdQTBhEXiydNPGo NwOmyd2yK9M1Kvai9bXnR7X11SCNPG2BUR/eg2SLKyL9T4RPkavkO+6LrvbPajx589jr DYxCQolvly6/HIekhBHgYJRr9nwbwS+HOFboqx7cC2EcijN0IWFH4iyGsCRHH/j0fZoq xM/L3KgelUI6uX0jqg7qNb1VY+r+JllZoFgotQqkHoCDggt+1k5qZeBi+qY3APtUZvbm xJ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MjPGVqd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b27-v6si1837085qvh.18.2018.07.05.09.25.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:25:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MjPGVqd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb749-00085F-Tf for patch@linaro.org; Thu, 05 Jul 2018 12:25:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jJ-0008Mc-OY for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jI-0007yz-NU for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:37 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:53352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jI-0007yM-HX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:36 -0400 Received: by mail-wm0-x230.google.com with SMTP id b188-v6so12141609wme.3 for ; Thu, 05 Jul 2018 09:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NnkXcRkwEzWiYqjh2Rik4I5Vm/tpitgUCIRXhfy8/ts=; b=MjPGVqd4mdiSejCEIRu1hVTzw2HVz0rORSMHTRocwI/1KON+cmDm2uS9mh0o6a4ZDy ZOv1tgy5JbLtmRaugCUHqZRc2vWWc8vEn7RFStZIuJ2lUPHTLPTzBIgihJOeSl0ovQoG UW6zuBYxNDwPD7OZU/IYOHkzlInny/FCb2ZUU= 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=NnkXcRkwEzWiYqjh2Rik4I5Vm/tpitgUCIRXhfy8/ts=; b=N77TY0yUUDbyM53HnpEgQPqNG4SRjchTfAEnGVSWqgwAkINWYK9SSjdTx5K7VLYMRs Vsx99t1yhXgCsLgJ0ivEyKH0qu1Qgg9szL86XmckofqNnQKO5w57i1AacTDVw1D7Uwc4 P4fuhxzZpGFCd8J6GIdWcmTvlivWuWyrWNz3LIQekVk3Faa/5/RqUxal+W9MbLB0zjBj eM0lYqtkHOapHP2GJjT1T0cbQc5mFmZCe3ZQSe+HN5gXwDXdDQn6okt2hHIvQVmDD1eg vKNpmCJ8hbs7xin+LUbEd0rxaF5usw8OLe5qFG3veb+JYwOBFt6bNZI9ni02OAFk5yjk uyGQ== X-Gm-Message-State: APt69E2eYgDS173BvIXYzY1gafGWO2MDBozo9aG4kDDOxXD/Yg7/TQgl v+75craAh/c0TA87PgmKqwm+kg== X-Received: by 2002:a1c:be13:: with SMTP id o19-v6mr4240643wmf.1.1530806615345; Thu, 05 Jul 2018 09:03:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k13-v6sm4035743wrr.14.2018.07.05.09.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:32 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F39993E0930; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:17 +0100 Message-Id: <20180705160329.30386-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PULL v3 08/20] build-system: add clean-coverage target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This can be used to remove any stale coverage data before any particular test run. This is useful for analysing individual tests. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- -- 2.17.1 diff --git a/Makefile b/Makefile index 39fd4c0546..9731ec1bb7 100644 --- a/Makefile +++ b/Makefile @@ -723,6 +723,14 @@ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ "GEN","$@") +ifdef CONFIG_GCOV +.PHONY: clean-coverage +clean-coverage: + $(call quiet-command, \ + find . \( -name '*.gcda' -o -name '*.gcov' \) -type f -exec rm {} +, \ + "CLEAN", "coverage files") +endif + clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h @@ -1073,6 +1081,9 @@ endif echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the config' +ifdef CONFIG_GCOV + @echo ' clean-coverage - Remove coverage files' +endif @echo ' distclean - Remove all generated files' @echo ' dist - Build a distributable tarball' @echo '' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 66ef219f69..7f04ca104e 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -161,9 +161,14 @@ GCC gcov support ``gcov`` is a GCC tool to analyze the testing coverage by instrumenting the tested code. To use it, configure QEMU with ``--enable-gcov`` option and build. Then run ``make check`` as usual. -Reports can be obtained by running ``gcov`` command on the output -files under ``$build_dir/tests/``, please read the ``gcov`` -documentation for more information. + +If you want to gather coverage information on a single test the ``make +clean-coverage`` target can be used to delete any existing coverage +information before running a single test. + +Reports can be obtained by running ``gcov`` command +on the output files under ``$build_dir/tests/``, please read the +``gcov`` documentation for more information. QEMU iotests ============ From patchwork Thu Jul 5 16:03:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141191 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2124939ljj; Thu, 5 Jul 2018 09:11:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdD0ZxhYjkhrGuDW9KSWCl8Y9ap1SspUM9CdFk8u2gvAL5+5I3j6kxC2BLR5ePmvoy7d/sZ X-Received: by 2002:a37:5805:: with SMTP id m5-v6mr5450021qkb.346.1530807106127; Thu, 05 Jul 2018 09:11:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807106; cv=none; d=google.com; s=arc-20160816; b=QSiVGuRmvIldVhfD7CTnfXE5r/Ya1gw92+Bg5w1IEjNs4bMjbNppJfbTpaBuLg1Dyv peNkbuOruVnER9hcnVXHN252mqnjDhF5dqgYY0GNP9z4VBm7H1ENh6LPtXfafPoqweaq oSA0ia0jzB6S+aFygsfyKuE3Lplyi4gp3GLEZwrI//oYbBjbYsyqq40L8xedOxwN5LdR rhcemUnVOsiuzrEtIY3NqBakiMbdS4xuXPAyELuBV4NHZ2Mmo7B26ovsDAjEHmKx7GWH lTogVEc0Ze0fzjVx2ga3ZpccBfFlOa18K1Bq9umhCgpoo5J/dI1xKS8EhtqOcrnFcWt4 eMsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=yfiPrD8MVbQo2D0SiANx9bGjSFw7MjJV7RNKaiAv2PM=; b=glY5DVsqht14Pqs/iyCsCX7cXkTYglF3Ofs1BOLAEOFfhgBFSWIjNGDlvvf/a7IS2X QQFlqiI1NPN5ybshqQ1ixD4e+Msdln6U2gYH1UT5NuBuIXRU0GO3J7pGjRs+WjExDcnY VyL+IeXzpr1FGskqeE2eR8rTRR0G6ARf2IxW1BUP3vQJ7nb7RTDcWv9YpkAL22VEtFSO XTJYx4ROXDsjp+Y15qO6oBrx2FoKKykW9wAWC5cFh/D365orF0tVXucJfO+Bn5XXeVT2 UuhUmBurDbGzQkOYbLwT5vATMCtILjX9r6fbXxIToAMsButqqOR/+MD/21euCD8eH/FF eSwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L8KBeVDh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z78-v6si5115479qka.151.2018.07.05.09.11.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:11:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L8KBeVDh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6rB-0005oi-IX for patch@linaro.org; Thu, 05 Jul 2018 12:11:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jQ-0008QZ-NX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jN-000829-JX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:55700) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jN-00081i-D7 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:41 -0400 Received: by mail-wm0-x22b.google.com with SMTP id v16-v6so12129344wmv.5 for ; Thu, 05 Jul 2018 09:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yfiPrD8MVbQo2D0SiANx9bGjSFw7MjJV7RNKaiAv2PM=; b=L8KBeVDh2lay7xItlpxgvsUasIe8vv78AFBmpiZqkSYzRTOTO8gLfVZchH6WJVTLKf m1fQygvUWlPBNM1FBZKG3Nhq6kyBW+JKtvDNxnOMNI33HXjIydxcJLhaVRHkJAhZnUb1 7CGxaTkJz93VHEI5mMOfP4PKM+LRTqkWLfV8c= 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=yfiPrD8MVbQo2D0SiANx9bGjSFw7MjJV7RNKaiAv2PM=; b=av5iuf2FMzShTaINJFFD3AlwHxAElTWkyiN3RzOHy8kL72OFGW1pvceFIVzgJZqtXx RJQgIzkDYBcmGnmKF2b7gKCGhG56o5KnU123B6vbXDoPfgQ0y1QaJdPTKc8pmkvGrUO7 nE1u8F8raQ6gmRc/hJmdyNUcmYkBYAs2Dtn/GFJ7vyOQJoOByZ6N4otdYOVW+rJLJl2o AJKVRiZzSBEcRuwBD0XTepgv5jqjyqXSmK0UXHPXgrK2dMAiKwC2XA7pe0jyZz9zh304 bpqA9ku4efXTkySrSl6Ln4GNMCnzgJpEn1UOnqARXNE+6im10nTTeyOr4qLgcWQWE0WD JF4Q== X-Gm-Message-State: APt69E28w82Lo8PdU/amVF0uYazlIbCAt2cYrKml9wNKB9MuzPZIEIk8 hGVOud9nCvvfsPpEnFAQtsyKpg== X-Received: by 2002:a1c:b5cb:: with SMTP id e194-v6mr4631850wmf.133.1530806620190; Thu, 05 Jul 2018 09:03:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z62-v6sm4825731wmc.10.2018.07.05.09.03.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 120543E0A3C; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:18 +0100 Message-Id: <20180705160329.30386-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PULL v3 09/20] build-system: add coverage-report target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will build a coverage report under the current directory in reports/coverage. At the users option a report can be generated by directly invoking something like: make foo/bar/coverage-report.html Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé -- 2.17.1 diff --git a/Makefile b/Makefile index 9731ec1bb7..2da686be33 100644 --- a/Makefile +++ b/Makefile @@ -986,6 +986,16 @@ docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \ docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi +# Reports/Analysis + +%/coverage-report.html: + @mkdir -p $* + $(call quiet-command,\ + gcovr -p --html --html-details -o $@, \ + "GEN", "coverage-report.html") + +.PHONY: coverage-report +coverage-report: $(CURDIR)/reports/coverage/coverage-report.html ifdef CONFIG_WIN32 @@ -1095,6 +1105,9 @@ endif @echo 'Documentation targets:' @echo ' html info pdf txt' @echo ' - Build documentation in specified format' +ifdef CONFIG_GCOV + @echo ' coverage-report - Create code coverage report' +endif @echo '' ifdef CONFIG_WIN32 @echo 'Windows targets:' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 7f04ca104e..5e19cd50da 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -166,9 +166,14 @@ If you want to gather coverage information on a single test the ``make clean-coverage`` target can be used to delete any existing coverage information before running a single test. -Reports can be obtained by running ``gcov`` command -on the output files under ``$build_dir/tests/``, please read the -``gcov`` documentation for more information. +You can generate a HTML coverage report by executing ``make +coverage-report`` which will create +./reports/coverage/coverage-report.html. If you want to create it +elsewhere simply execute ``make /foo/bar/baz/coverage-report.html``. + +Further analysis can be conducted by running the ``gcov`` command +directly on the various .gcda output files. Please read the ``gcov`` +documentation for more information. QEMU iotests ============ From patchwork Thu Jul 5 16:03:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141192 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2125409ljj; Thu, 5 Jul 2018 09:12:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcWznWF2YLDxj/O8Awbuw0J3chsB0gwN7bVXJ9lXzJCD9kavkdYjzr9t8EuUDmr4e9DtPMU X-Received: by 2002:a37:65d8:: with SMTP id z207-v6mr5314863qkb.81.1530807134441; Thu, 05 Jul 2018 09:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807134; cv=none; d=google.com; s=arc-20160816; b=0+hiwrITJQ0ESxlE5x3G0QRgZHyICNl6yrY8Ue6u9h4qWfvW9zsDboOGmlFDHXlgkR AHx9lT88s+JP97Qj+37jEZlsrrRCk8tnhNX/2YYnAQLhvTt7aujrzFwrIeiihsdm1+j4 JVf1/ksY3n8Yr+TUivELow9fl9rFM5qfaMR7qttABDOuisJfQJaTH/fjooZxlY7TAunF chWvYEpGWIFBvTknEOlikNPrHAB54OuM7YYLZRz5QmmhHpBMGrBOHwc4QUwXOzEzXe5k emB7Av2Z6TCk+eE3SwAMk7DjOs0NYfqUekKpj1zs2Rj/dRf5M59gxtP8dPU1dYvCR+0P ailA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=7lUnldhhTj3qPr3tQFlZRzfuhm3U44xJ124drmSuK44=; b=TYGexee23E7IXdn2RvH2/tbk0/ly6dvUBVuHuFZreZyldqeSE9BLJ/4cRX9j6+WrX/ y2N1Z3Okiz+NR6OiRmCttDBwH1M/J73vnKi8IvrhILqeayLDMNK2X9E7JhkUqP1Lkck6 BSXDHEfExVp9ANUdVIe2cz39lgF/MvoBkutZBc97icHr67GtkVo+ZoJ4QHIDbvSsTvqD uoD/QzP4rdufSfBLxdIOW2y8kM67k7fnfAA+InS00/N3JwLEDoyOcQh5SIeq1yZyWuVt T/GTB1dHVP7uPH2KAoSPN27m94RXYjOORCPJas1W8eRK86VS1qm0jL1gXq4SHd1DUF2Y FDPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dqwDqhWo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q3-v6si2573434qtc.166.2018.07.05.09.12.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:12:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dqwDqhWo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6rd-0006yp-TR for patch@linaro.org; Thu, 05 Jul 2018 12:12:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jQ-0008Qf-Ow for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jO-00082Y-5X for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:50631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jN-000824-Vk for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:42 -0400 Received: by mail-wm0-x241.google.com with SMTP id v25-v6so12157167wmc.0 for ; Thu, 05 Jul 2018 09:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7lUnldhhTj3qPr3tQFlZRzfuhm3U44xJ124drmSuK44=; b=dqwDqhWoD6kPvrAYQFOjmEPfPLLqDpjgHjMBjCFqt7vw9KtC8oqAk0TfBwMR0PAlmk EDyjGLP49WVPK8FF7sGQKD/AjU7PR62mhcOBWi4L3VKGZdfN6/+oPAciRitW/6OUGSkX u78OQTMOIzMs6PkZ+ptICzXsTrE4qArkFTpL0= 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=7lUnldhhTj3qPr3tQFlZRzfuhm3U44xJ124drmSuK44=; b=h9PGzDkDxFCcI5Z9UeUsXBkV4R3s+4vVEiyhgRTHVprDwxxhLmbsxl4noVel2mDOIy /G2amKSy31S0VsFyofEDkNf1WUfj74uBA6Zaa0htqYqguYYjEsksbNkkYNCsmS0wxT1C Cdfk+r40yqTKEYXWSv+DdV4r9CusNrBB+FtQDo35le8nqVMc58s+49pnn5z7h/5/SCnU 06CygDmQWWVsPvlL2+jJkz8feLJXdngI8B44iEI/Xn3SgaFyZXDKWLE6eUTBrh5Ap7Vb TaVtIsy22Uk1wHQdNeLyVmjZFrZXlKhM+UZ4KgihIkg9hdI8rfAjiUiEZgmbJi6xJI8v PFwQ== X-Gm-Message-State: APt69E2TSUVlR5I7cQ60RXFHUgBemORKLcutvOaMRnAIrxYY4AvnsUs6 eqxu/mOivyFJYMqKS+OD0LIhJg== X-Received: by 2002:a1c:149:: with SMTP id 70-v6mr4790967wmb.2.1530806620869; Thu, 05 Jul 2018 09:03:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x12-v6sm11224506wre.27.2018.07.05.09.03.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 274623E0B46; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:19 +0100 Message-Id: <20180705160329.30386-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL v3 10/20] linux-user: introduce preexit_cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" To avoid repeating ourselves move our preexit clean-up code into a helper function. I figured the continuing effort to split of the syscalls made it worthwhile creating a new file for it now. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Laurent Vivier -- 2.17.1 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 59a5c17354..b5dfb71f25 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o + $(TARGET_ABI_DIR)/cpu_loop.o exit.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o diff --git a/linux-user/exit.c b/linux-user/exit.c new file mode 100644 index 0000000000..aed8713fae --- /dev/null +++ b/linux-user/exit.c @@ -0,0 +1,28 @@ +/* + * exit support for qemu + * + * Copyright (c) 2018 Alex Bennée + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ +#include "qemu/osdep.h" +#include "qemu.h" + +void preexit_cleanup(CPUArchState *env, int code) +{ +#ifdef TARGET_GPROF + _mcleanup(); +#endif + gdb_exit(env, code); +} diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 793cd4df04..bb85c81aa4 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -623,6 +623,14 @@ static inline int is_error(abi_long ret) return (abi_ulong)ret >= (abi_ulong)(-4096); } +/** + * preexit_cleanup: housekeeping before the guest exits + * + * env: the CPU state + * code: the exit code + */ +void preexit_cleanup(CPUArchState *env, int code); + /* Include target-specific struct and function definitions; * they may need access to the target-independent structures * above, so include them last. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 50e20fb659..5822e03e28 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8022,10 +8022,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } cpu_list_unlock(); -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); _exit(arg1); ret = 0; /* avoid warning */ break; @@ -10131,10 +10128,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef __NR_exit_group /* new thread calls */ case TARGET_NR_exit_group: -#ifdef TARGET_GPROF - _mcleanup(); -#endif - gdb_exit(cpu_env, arg1); + preexit_cleanup(cpu_env, arg1); ret = get_errno(exit_group(arg1)); break; #endif From patchwork Thu Jul 5 16:03:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141202 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2141674ljj; Thu, 5 Jul 2018 09:28:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcR+Qaszp/oUcMxhul5rktfyqyMFCJV2kL5C0f5u5jcF6VImUMtWH7U+Mhh7T0uy2ONrRb3 X-Received: by 2002:a37:50c3:: with SMTP id e186-v6mr5552742qkb.91.1530808106089; Thu, 05 Jul 2018 09:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808106; cv=none; d=google.com; s=arc-20160816; b=mEu9gX836Hs+7h8tD2IGs3/0kDDSeN2+TQVqd0VboENWhbEriCCJcjDsvzGU/jtIpN xOgXk3EcG4EciF3XCO6podpEFOoCH05I86uC3toBuuIGrD73JR9DG/pwwXRo+G3YJ+HL A04qGFY0MLbyX3r94HOp3V5csaz2ucCCI8X4pLgT0SWvyptj4JAC2y3PG3QtcuOwK81O reBYBuAcg7kvE6fRuH4+jw2hIpKRHbSjwaCF8rlJv+8+NtG/j3oKvlp2BojoAX6YeZTH +LhEvjRq8Up5qVZxaikPZawBoFCx6xOIEUfJfLulKUYmX4qGZsTP2jXxigawbmKRgViw 8fzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=J2URoFD3Z8yP//iJ5CCtj6q/PaXcHH6//h8OPAfT7Sm5QppderF61n3krDWf+M5u1M DWRPKJ7WldRfmPSWTMee8yiYjeO6Xz/RZGfSJqLHY4BWpCPDoZO50KIgdry/FKX2/S6A CBBe+Hqw4a3MSKvWR7/j+tEPrY5d67OpJ0k9sYFsGnjegdARQR4txN4MkRc66YEiVZKM n9uejEj501dYc3eeVMthiOA6cRXPWwqnYjAO9WEeD8SmqcUO0JoDkDWnSS/2ecq3OAqs Hwwx42Cd/3fnxKSx3vp7yvvf9Tz8XXIu7g/M2LJwlqSRcb8PkByppSQiqPm1n1SWV3Vv 1Bqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jfGAHLmp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x4-v6si4036585qtp.106.2018.07.05.09.28.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jfGAHLmp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb77J-0003Ct-H1 for patch@linaro.org; Thu, 05 Jul 2018 12:28:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jQ-0008QY-N6 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jP-000831-2n for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:37193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jO-00082c-Rs for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:43 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q10-v6so1472605wrd.4 for ; Thu, 05 Jul 2018 09:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=jfGAHLmp5SOzjFQF7Gf025C5A2Y9HbkvxFgGkfGFMSSPUv4o1QRXtzZ4OGNJEHq8Ww UIFlMhc6jVT92fz6S9qQ5r1nZxJ3/NXTPU7S+ghmUPISQ6DjUeulopGpr/WiPzqCbJMp ApNGqQHfzLEsFdeO9+l9B5coLmkMFFiNU3gF4= 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=26jHJcKVZxrJ3kF/okCbHv+dP0VTbKpXYEPZSYP8zmE=; b=DQEcMgeM5qmNW7fgMcQGC/ZS3CKrHGeiLQKvA6izizI1H/EYBF5I5itcaeoFwUu3Dn bKV24rPGGQM0uxq6sbpWNsG2Q9YfFEI7FvvrDwEyIjUXe8vKLDIBNjd5myCt84FncA9u kVDeHCN6snEGvr7Jatz8ynSjVHC9YnihJZO6BQYNytOIdXGpFmj5IlGRKi+1s6fEYagv fjoyKQeUZQzgldFqwdo5Q95s6X6KfpQ1VR2T5t+sqSp9Wm5dZN2oskeg7hL1+mRCsoJg MaPhHvbCZBSYxi/joYU2OezrKQqz0JbtuSA0TsiJRNlf8ZDyJwz7SPLPGKR+YNr97aj5 yk0Q== X-Gm-Message-State: APt69E0x9lDzPjtIs/CfnEgAIn8ctvXyekeoedysYw0jrkE1f2lAClZH niXfrIeF5urmCPmHsCgVjsjmKg== X-Received: by 2002:adf:fb43:: with SMTP id c3-v6mr5392164wrs.32.1530806621738; Thu, 05 Jul 2018 09:03:41 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h12-v6sm2529014wmb.3.2018.07.05.09.03.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 395A53E0B71; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:20 +0100 Message-Id: <20180705160329.30386-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL v3 11/20] linux-user: add gcov support to preexit_cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As we don't always take the normal exit path when running a guest we can skip the normal exit destructors where gcov normally dumps it's info. The GCC manual suggests long running programs use __gcov_dump() to flush out the coverage state periodically so we use that here. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/linux-user/exit.c b/linux-user/exit.c index aed8713fae..14e94e28fa 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -19,10 +19,17 @@ #include "qemu/osdep.h" #include "qemu.h" +#ifdef CONFIG_GCOV +extern void __gcov_dump(void); +#endif + void preexit_cleanup(CPUArchState *env, int code) { #ifdef TARGET_GPROF _mcleanup(); +#endif +#ifdef CONFIG_GCOV + __gcov_dump(); #endif gdb_exit(env, code); } From patchwork Thu Jul 5 16:03:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141201 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2141376ljj; Thu, 5 Jul 2018 09:28:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcfcSLrTTdamaC9lHdJIZxOYgXtBZmv06ktVJi5fD/JOLBWHNwqTVYGpkKfU1hc2fsyfPKj X-Received: by 2002:a37:ddd5:: with SMTP id u82-v6mr5609221qku.420.1530808084298; Thu, 05 Jul 2018 09:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808084; cv=none; d=google.com; s=arc-20160816; b=hqcsUuACFtKCsMrEZZPP8wVCO5l98w456meELRC8xI4Rd7w/1qjqrhhDuwigEz+s6a jQNWU3qBX+IrAeM1dhJP/MfzYu/ZmaPcR4zZIxLaNbXBGb/JVpNOc5YWYfzbqjBOLre8 02F8+uUkZjWZx7b/3adiCKJcg3bh0vcrL8b1Z8HWniqofIxAx7Mxnev/Ktp3wf+/mU/y u+ZJCfQOKf8nzpD5pFoh3z4KIynbMCGCkDvZvWbV34fTr4ZH08XXxaqagXMLCIFAHTDy j2kEuVFss0suAXDDv6oOq7lN7BGXj1sewe6TYtytEcO4jBdekwofoCgbVOzquMsvnVQA iNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=PnrANg0fEICiTuO7vktEd4oKhhm0H3YmSXdVgLB3fqcYAUYf0/VmKbKqHvMgw6oPLJ ID1QvVLedJpR4S3PyXZy466AlaN0XCBN/6S/hWjmX83BMxJptkNYHcSpL9QBQgsZ9Kkv 2UCy9FIn355Y6P7xV7tzO61/TsJyDWNo64mPAOGHtlZk66vAK+ExEYP/VBdKsobKWWZf wNWh9zDmaoJoMjsMVODWNhAlaoYBIsHEXavS5VETlrUOWdi9QbD8+niw8oSXj5M0QNIF EVrwYJEzkZuieFf2liBtzJ2TnZazT4+sGSH0LHYC2lRz8frdBdfXeDequ3WuzTSU1kmx uIWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hc8QRizl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c79-v6si1981508qkg.128.2018.07.05.09.28.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hc8QRizl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb76x-00024u-Lk for patch@linaro.org; Thu, 05 Jul 2018 12:28:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jN-0008Ni-UL for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jM-00081q-Qd for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:41 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jM-00081O-JF for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:40 -0400 Received: by mail-wr1-x430.google.com with SMTP id c13-v6so1432746wrt.1 for ; Thu, 05 Jul 2018 09:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=Hc8QRizlWUJmewQj7zCHbzoE+fzk+PhAPsv+6aQCN1lFk/+UA56zvU90kBJKPaYGm0 1uaEXOOLnIwpjuEWQh2lA7ZKpuqyLdCXLxgdzSM9fBluwWSwvbZh1ijxO+OdRhi1lUot Ya17gkwD+VPNDlTkhlhqH7LRSdh2erVjdFdkg= 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=67PRJX64n01zQtdiLOJbiBT3rliQYwWOfXFA2tr7xWQ=; b=BQTOD7TvlVxyqEyt3wBYafUPBl1y4PpxmhlLAoBxY4lt5pWDozhAX9JIKv87TY5gSJ Xt0WS2s7Toeiz/5t8/p2/gAFRk4RP5mHgCojkgm+yvfunnW3arHh3CLyJhrtgxtyue5+ +eW3vtezWGGLKI6HkyHBnIGpzoWzKu8LvRnRx8pB7KOvFOG7hoq/HijMa82LolI4lkha hM9loz3iiMtwLTRt/ojMmU5vRvIZPD00Ypat/Sgj9E4QHobvvmNh0xeOzWoV8M1SEFCs 3cnrrdSPP0rdo3G7Ynu8/w77KpMN/AjTiVtksNQ99w7IE+5FN+sizHihrpO/Qh1Pq2zv /gpg== X-Gm-Message-State: APt69E0wHA7VtciGuAZ2cwWbv9GF9hzQnAKwkAFvEsj6puumcPUqEqrC vR4JqLCFoVzHJ06OAyr4O3m/tA== X-Received: by 2002:adf:ce04:: with SMTP id p4-v6mr4770445wrn.275.1530806619468; Thu, 05 Jul 2018 09:03:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 131-v6sm13547090wmm.31.2018.07.05.09.03.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4C01A3E0BB0; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:21 +0100 Message-Id: <20180705160329.30386-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL v3 12/20] docker: ubuntu: Update the package list before installing new ones X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since docker caches the different layers, updating the package list does not invalidate the previous "apt-get update" layer, and it is likely "apt-get install" hits an outdated repository. See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get This fixes: $ make docker-image-ubuntu V=1 ./tests/docker/docker.py build qemu:ubuntu tests/docker/dockerfiles/ubuntu.docker --add-current-user Sending build context to Docker daemon 3.072kB [...] E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgles2-mesa-dev_17.0.7-0ubuntu0.16.04.2_amd64.deb 404 Not Found E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? The command '/bin/sh -c apt-get -y install $PACKAGES' returned a non-zero code: 100 tests/docker/Makefile.include:40: recipe for target 'docker-image-ubuntu' failed make: *** [docker-image-ubuntu] Error 1 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index dabbf2a8a4..c03520ce3f 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -1,7 +1,6 @@ FROM ubuntu:16.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list -RUN apt-get update ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ @@ -13,6 +12,7 @@ ENV PACKAGES flex bison \ libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \ texinfo \ gettext git make ccache python-yaml gcc clang sparse -RUN apt-get -y install $PACKAGES +RUN apt-get update && \ + apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml From patchwork Thu Jul 5 16:03:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141206 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2146991ljj; Thu, 5 Jul 2018 09:33:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe2f3uRHQswrGenQHXFjZqFxfXbEvZYNCmaQ4M867l+xCnUKIpa0q+O/OQZ1O4I1hna8cJ1 X-Received: by 2002:a0c:9843:: with SMTP id e3-v6mr5764395qvd.44.1530808416868; Thu, 05 Jul 2018 09:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808416; cv=none; d=google.com; s=arc-20160816; b=SEyCDeYpGCCISHuiedD5KsC8BV/QbwYuJJoWGAelZq5LWURk7A1e8/ENNAcmMsmKl2 vW+4Ex0CakDqiWoH3r8k7xI4OMHD+/A5uS5MVdDyImo84WpOmf+9cYrm7vj+4XGAefZ8 crcB7MRhIHSkmJxHs0iZ2RF5V3tWsoVY5UkYnMTbKM1dnmhMl8eRY4mUbVd9A2cPE+9z u8Lg7XvWitAO7fxAjpoa+CYTH51MwYYY4k4uuz7cfZB7U3TiZuA9ah301lnljDurtzcc fUSEdVHq4v8+MfOPeDNIh+6U6WmDhLBNAJxolK3LeR5rwXFrBsF6w/H3eyC2jffQ9tzP abag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=J0qDEZ0hSEfDVpbb2omJbnV/nsKfBWAGt/xq6gutRnAujAEVRt55/nb3RQ9ekGhSjs oQq52uB44SYAvEAUd04wFRiY2RXV8sl3HDCEDTgqAQuzmSsXGWUIhq92jDeh00gSZKMf lgf3F+tOkQvkLRQ/XpbDNhU6EXfKkHYj1YHupc95lAlDwOK1+v9/Iv95SMipXeAlGNfq UMQoXbTkSfeQEMwKshE9PnnWIfis3Xeo/ZiixQwk6oxyyrNfwpNY04p6GgF4SqEaps3X +Sf9r+sWD6NThN/NjnVIdnAal+fReg7mImhS4vwnGl3DakJHOMtlQ4n/FmNJYcQiUbuh X7PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ida9zAYk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o3-v6si6255414qkc.17.2018.07.05.09.33.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:33:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ida9zAYk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb7CK-00061H-4O for patch@linaro.org; Thu, 05 Jul 2018 12:33:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jS-0008S2-EL for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jQ-00083e-4f for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:46 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:52418) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jP-000838-U8 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: by mail-wm0-x22d.google.com with SMTP id w16-v6so12071018wmc.2 for ; Thu, 05 Jul 2018 09:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=Ida9zAYk6YNDeFxVU/qCWdCNYSguT5ELPRHzxi4REL8yA6HpYAhO+Qfy3vp0LRCfAU mDPb6A1sa56RMVC8kTsHnbcBaJ9DiKjbUDH9dUXU0O8DJsGmBeGyFtV9JyfG2XbLjm46 4lEA6a4Ztz+/Sbeo5a+cPMrty95bUFDXpw72Y= 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=tqitWrrthW3ePRqHSPq6AEIbvarXAfqV0MP+oDmH50g=; b=EJX1CwfIEMvhLfy/5XQM59MW/bVRaGuaCdgGH7E92MXrOkYi8Q4OMv4LYFpks08gDv 53CNdErY8gFi3XTEF518Oci1lJIgZte7XVdP0P+nLSHiqXCJntgpyHM01XEi5tHzVZoR u8Gw2j6KDMRLv40jU/BvockGv8BXaYPKk6nkDstA/n8xq/4mDoZdVuvuIDuct2gjbdR1 G6pzOnGbiKupZ6gElHYzgXS4LhjXl/dquLxrb7Qu51U1465HIqATdUY+Sc4UJkxTjoMQ /UAZNTM/xiVz13JoxKbR3Jj/MVkf7q/ts9qY5CF1sedMbFc3+eaCGUIy+qREP4g/3BHZ HDkg== X-Gm-Message-State: APt69E1/FNJ5roDQBRS457pF5LiBjObuuzBg9kiqFlHwaZwZ71N0Nzty gby5bJuHTUKQKfO9CikWEv0NMiUYEaE= X-Received: by 2002:a1c:70b:: with SMTP id 11-v6mr4279506wmh.151.1530806622797; Thu, 05 Jul 2018 09:03:42 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 18-v6sm3904237wmg.19.2018.07.05.09.03.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5EE743E0C1C; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:22 +0100 Message-Id: <20180705160329.30386-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL v3 13/20] docker: ubuntu: Use SDL2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Do not test the deprecated API versions (see cabd35840749d). Debian MXE MinGW cross images are already using SDL2. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index c03520ce3f..7d724e7f53 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -5,7 +5,7 @@ ENV PACKAGES flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ - libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ + libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \ libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \ libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \ libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \ @@ -15,4 +15,4 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml +ENV FEATURES clang pyyaml sdl2 From patchwork Thu Jul 5 16:03:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141208 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2152967ljj; Thu, 5 Jul 2018 09:39:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdZvbw2l2iS5bPmlvBEvWX9u9po0Tz07G7Eu+OygycN/bajpfQ7ft4JhLDUYXSQCEgT3zgL X-Received: by 2002:a0c:9843:: with SMTP id e3-v6mr5784120qvd.44.1530808794565; Thu, 05 Jul 2018 09:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808794; cv=none; d=google.com; s=arc-20160816; b=Ypi76GlEQ+lj5vmVrFbykcuKielftiVnUB0EWws4hlWTfWayxm0/mfxP1MxdlFiALX PzPZ3KarElcntmGiHKz8fkqx4EHxB9Vf0x/YqqoG3R+/QI0Pgxs55DORbKLTiPCXH26Q 2Fa0j/SA3hb1qbADYTEvO5rLB8AtOPuIK/Prhnn6vTmxQMgiOiv3QhbYQpIjGI3HyoYw kWGOzT9JAYgXxAVnMHjafGd/nicwsJFIFR59Oj0sLPsDTRb+KSysECvPJ5SQTeTrcl0p oz7mB1tzdcRZsAw5SbeyAm1E47aKeFhmVIZlO+FzgmORBqnZaFTII0DV1h2ppkX27+MT OEvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=y/KTJ2oCGObYthBA21hWB6d5CI5+7vCKCLePsCKWIAJUl195RDwVA+IJNHId/gbzIg 6wRbGbYAA+ZMwYoi7vG2Mkgky8a/rrHSiAR3u1t58j8gN5pEMG6mmqx7ub1O48WFj3G0 dXLEawTywbvhcX7AbL7Xx1OJRtl+7xjqPBjRJ/sBtQVXtK6ADrt3ZgaxiSsoJS/c3tqx GVur6j1s9IQcnEWr3bfnAGpO/hY9aosoKmz5ec2fwnwW3Q34VaXGDdGtOe57siHq5rdu ZqGvpLhxijfVgVnlOsV9VwyDhIK6XRRvB228nHGIKhwONpgJPIABACaKqgyOsaNdnz96 IGXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bzl1tlVP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h185-v6si2700650qkf.234.2018.07.05.09.39.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:39:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bzl1tlVP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb7IQ-0002U2-1E for patch@linaro.org; Thu, 05 Jul 2018 12:39:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6sr-0008Ox-CT for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6sn-0007Ve-UK for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:29 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34001) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6sn-0007VF-N4 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:25 -0400 Received: by mail-wr1-x42d.google.com with SMTP id c13-v6so1451837wrt.1 for ; Thu, 05 Jul 2018 09:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=bzl1tlVP+WX+ruus3Zbis8kkFvtU6viHu61hYRcIsTZa5gBskYREDzWJgRV6YxoDQ5 tyOeX7yMp5mO+/EWMocHYoRQQRm16DS8xuvGhZQjaLSi262ANhVPvqDrlIp4SiHgpIkj E44pbkaVauwRCV9xKTL4pitGx78Qu9HfqrClk= 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=Ay+M+0PhGOd4vF3x2EnXW5J1w/i4JFFPlcXOGETrRI0=; b=p4kEtHyG+OJljx5fa7nOYwl83iuFPsPYDvLIB/Tpy72FDjOtvgpbt614o3UdV9vkPt Y0VkZM0EYSUNCVq1qNe8bj6Ufl5OqSzobCe4hAyGEJ47kz6MrfeV4d5w+TzHNCAwyvty xPMSCD7WQSDM660L+E+gUVxNtCrHB+Mk3FzG6AZnRTaZ/gWx/n9I/YRQHzqBnMo9URnf YcRcSF6NKd520mBCj5Yni8nOHwg6ESU7TCG4VFBntI8J+KJP/i3bRDw/feJguSKhoJeD C41y6i6aFWzYN88dSP4mwwhGZB4AFb7t2RITyMdgFQKJWUETZDTKwF/S5gm00P/g4nw4 KEsw== X-Gm-Message-State: APt69E3j+oE0IoUOWVOWXuP5ZTuahG2648rNRyN4hWbxlw7OWv2AoY7d MFDYMxiNxHkGgZ3g/FJZE5HoTw== X-Received: by 2002:adf:b502:: with SMTP id a2-v6mr5341308wrd.273.1530807204713; Thu, 05 Jul 2018 09:13:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v15-v6sm4579479wmc.16.2018.07.05.09.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:13:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 713F93E0C8C; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:23 +0100 Message-Id: <20180705160329.30386-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL v3 14/20] docker: Clean the MXE base image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Using the duplicated same package is confusing. Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker index 9b8e577b03..2df4cc8c5c 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian8-mxe.docker @@ -14,6 +14,6 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ libpython2.7-stdlib \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) ENV PATH $PATH:/usr/lib/mxe/usr/bin/ From patchwork Thu Jul 5 16:03:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141205 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2143797ljj; Thu, 5 Jul 2018 09:30:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcolwzwWghW7zmuUGN3ZX8f19eUoi0fHBhqkOEn2bM9dAgwqqqJQSdPbupVZpDLJAhfkwIZ X-Received: by 2002:a37:4951:: with SMTP id w78-v6mr5426016qka.2.1530808235944; Thu, 05 Jul 2018 09:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808235; cv=none; d=google.com; s=arc-20160816; b=beeaqWlPLecaI80VkjXvG5bOwr9B8zYQaNh/JGsJIGu5kYBZqJ2AbQlIueCf2qxjzC 35V9fLJ1bkFmNu+Ma16auiZQEn5ly/pmD4LyTJKKcYadn0e7Md4XIsR1KiUQm9usY3sc pPBGtfMG9/dAfqBZvCoxBTGs08WhdQFxRhnWxWIeOlwqVAiZYbvjniAjAJr5b0nfOzzA yoEwl1kh7x1XiUNPHLHZLj/VogktrTi5jViR9si/E9MkPI2eo2gJLU77ekC7zjGNPxHE IHnNi93ejZFKW8BRbzlCLVX/uYDeeWsjQF4cgs2Z4FMNt1ymZjcBYl93/axed8gkSKqm eKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=dVZjaSBCXOrYuEo3jmSB3QIVAs8plv/U4oe0UiPoO9/Aaxdo5S3TOnMoevFg2N8J0+ B6ZKF07k/liRgm1OLeWy7iFm3i+R+W/sgHYS2QLAo9YQg4PlQV0ZoVDU1MGMrjKtZzAl 1QTpHZEMLlvFCOtVm5YZPGVTU0CGaiIrad5GwATRjcO83Fs+gniAnWNkgFEk8JE0NkWD KAIhs6pk3ndvxRas7vKIyPwDKbVLDvUmU40f9KaZETwokgd0sUUdriQcAx3RG9ZZlbdK GGhnOyrt4+gPf29sMG2Qk70hiRr24KUPanSlcnWIwf3w7Goc9LUN2/gkfG4TNtcrhysF RN4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HZMLH6p7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r2-v6si932948qtr.185.2018.07.05.09.30.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:30:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HZMLH6p7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb79P-0004R4-Dv for patch@linaro.org; Thu, 05 Jul 2018 12:30:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jR-0008RY-RQ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jQ-000849-Rv for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:45 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jQ-00083W-LO for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: by mail-wr1-x42e.google.com with SMTP id h10-v6so1470350wrq.8 for ; Thu, 05 Jul 2018 09:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=HZMLH6p79hANtOM8Q3kXUOzR2sa8NgR3I8g9dvXm2NGzaRw+an3aUb14BYxTB4GFLX Pf9YO06hBFe63utGjPHuauvkjDIOaZfj3jnKMPyXfAAZbkmTX86c/g26aCptqGLxI3BJ gdCuheSgvGcmrEEXZoXU/jHzcdUiMuDrWv9Vg= 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=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=i9gLxBVNeFAxvirzySgTQ81OVo/nWkk+6AbFVwO5MEE64uwiFWh/A0uBIZdtjzE2z+ 7bD/kbiMJHQ+JkNt7Q3K1SsoKBkIKF9KIJobgFe/Rve01Ol1Oq7SMLby5OqceHa0d5PV vggsF28chFB+4AGB+kF0xGQ2ovKF1jo7nkGy7UJE1JMPM3T3zFMLcUUN1mIUkrAPKmlY y+8wdKhYoV0MCw/RzP8PyLPItRwhI0qJw7WI618NKb5nwgQhQllIKI3VGFJZdttONRmv 4Q67FZoRSJpJvsVNlrmr52TogOiuoDcMduDH9rO7dBI3+S3vH5r4ffetA0uN3MKV+P0L qDGQ== X-Gm-Message-State: APt69E3wDfbAocL3bCGY0MWgXKZ4zLg8PDn9Q2fa8p91iV0iilb0S1EL jIDxpPdOaWJyxd2OrFw9TH0coaRlKPw= X-Received: by 2002:adf:b86b:: with SMTP id u40-v6mr4920608wrf.162.1530806623556; Thu, 05 Jul 2018 09:03:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l1-v6sm11643614wrf.19.2018.07.05.09.03.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 83CB53E0C98; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:24 +0100 Message-Id: <20180705160329.30386-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL v3 15/20] docker: Do not run tests in 'intermediate' images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..942d05649f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -98,7 +100,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Thu Jul 5 16:03:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141194 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2132399ljj; Thu, 5 Jul 2018 09:18:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf4R3pyvvXKhR/pTJTeRfFPVlnJkLPuoktzWqv3J3SV3yQ+XZ86snGgvw/+BD9qag0ZFuNt X-Received: by 2002:ac8:679a:: with SMTP id b26-v6mr6079472qtp.347.1530807527033; Thu, 05 Jul 2018 09:18:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807527; cv=none; d=google.com; s=arc-20160816; b=bZbSlgbIVFkJ+Cbp0Tyruo+m1gqwc+Z0JdjC7qhkGCa4mtOJTHO6xQe+8yFEMSmWNG Bl/klLlJeGSmOStRtgq8ufz/kA8YFfEMog8V8dYdDJTAqjlutOBV42tthTLu+bjglvp6 LbuZdh/FaQPbzb13zIaN/fWvpl6AOtZj2OV8AGEKVggFR0EeMoSCf7OLknpFf/gTPWO6 ze0xuARGSX8Qqa9zQsyBWoRRoC+HDLc3UlpqRnRPc5gix4hNFJYoHmL8OHCK3S43yWVK 3GX79AmNGGW2op3Ido9Ql0fkgnzYsFrzijGMe5DR6HTxrE91ZWiIjmP5qFBLVXjSBcfJ pPDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=ZC2pRCGX20NFqAu3IjAFtGWujiKdN+R9LhfCk336uNDapH0j5uxk01NjYCHdD7GTaZ pa2tQ8aSM1ngQ+yxR374metLK6GHDBp4wff68uya9qq5RaLha4120Va3Cy5scVU4XeqW U1b1PTqtjgWHRv7zAGwY5TVSrAtjaNEPxeOhfC9yjkFxCCbOEV0x1LQbGhhDD8sYUHKC Eh/4wbLH/2SVxiDYNu3Pc7fjN5tvKoJatUei508l9ibO8KKoEB+Y4ayvM7QzvovUO2cM 9tiqPPg9lK1oTs3ybsUC7Zhq05u2ZN6x4r/WdqbdFZ0WD/vChfl8tM4pV4pC7fqWCFrI m6dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="R5UuW/DJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k8-v6si5599424qti.248.2018.07.05.09.18.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:18:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="R5UuW/DJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6xy-00042z-Bt for patch@linaro.org; Thu, 05 Jul 2018 12:18:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6sr-0008Oe-5P for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6sm-0007Up-DR for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:29 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:55786) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6sm-0007UJ-5z for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:24 -0400 Received: by mail-wm0-x232.google.com with SMTP id v16-v6so12172069wmv.5 for ; Thu, 05 Jul 2018 09:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=R5UuW/DJfZNDf/BjQEtWccgYCyjUlMD0dY73czPchJIUmoWQB/dVULiFfZDJo04R61 npNrPUpFFX6yI6KRPcq5l5PQ9SOYL6VKcH5puAqHBkPN58U5OZTinI8YYQSUeQkqHwES ftP88aZ+qiOVuJGlaPVGjyKCkGHpJGhP1HrMo= 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=cnMq6Gj3jdsnaP51e6jpC06jGmLFPaetfeL48VID9N8=; b=qbkfndzfFlUuahdMJ7KotwJi92bOvJ2z9AI6/xJqXoYJwtauJvnWd/+J+FKStyR1wT 3ID63itof1UkE22Si/i1rt1taLaEz2zDJDPWL6dfS/lTbL0bwgcS0uFH7vol8H4BtvFL rXzUp+zSRcnaOnzBNDj0aq02DjLDuK7MikVr09JltJIJp6wP9sDTM2sGddmL2fdJdxLT jbpH3mNVL1SHSyytf16PA/Co1yRFFzYWWlahOw0LXvt4QgLS8DuY505N/yb5HSIfGM3C frUpSd/eEX2Zsxa+SIebPIOVP1j+KzDcid+E4JZZG8TOIfLu22mYXqm1nFilsxyaTkdT bjew== X-Gm-Message-State: APt69E1NLdJySHVsRkeO3zz3JsXtUPClY4Re24USTGJVPAhO8IGu3y55 iu8yDFXRL6+fRbrpUScamu//Jw== X-Received: by 2002:a1c:d543:: with SMTP id m64-v6mr4218324wmg.12.1530807203030; Thu, 05 Jul 2018 09:13:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i4-v6sm4763938wrq.28.2018.07.05.09.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:13:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 96A5F3E01DB; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:25 +0100 Message-Id: <20180705160329.30386-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::232 Subject: [Qemu-devel] [PULL v3 16/20] docker: drop QEMU build-dep from bootstrap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is best done with any child images that actually need it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker index 3a9125e497..14212b9cf4 100644 --- a/tests/docker/dockerfiles/debian-bootstrap.docker +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -17,5 +17,3 @@ RUN /debootstrap/debootstrap --second-stage # At this point we can install additional packages if we want # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y build-dep qemu From patchwork Thu Jul 5 16:03:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141199 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2138115ljj; Thu, 5 Jul 2018 09:24:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpce+zRwkPjgndJBvc6QKE72EDaiknGY5wWpa0pX26o7dfxXoOCSd1g3VIiof/fJLc8EHEqk X-Received: by 2002:a37:5a47:: with SMTP id o68-v6mr5884126qkb.226.1530807882602; Thu, 05 Jul 2018 09:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807882; cv=none; d=google.com; s=arc-20160816; b=bEDOHLeokYeWpnDZXGtUasNEWMwSB4FVRcycjDVJ3cu7U3vxLRH3XXioeFy8STVPtN a7UaxSw0vmVjXVzCdoqum9cMpVLeo7Jr8qM6n8Zz7NNiPjJha86NEeBvGPtvLgu4itV4 amU/1umxsFFuFMNuW8DRT9qHJUJsXDo1ADq9/CqT3587KTosPNf3KIokXT+cJqRdeNNF N/bbGdqMwsTpVHtaoYxDKg4uUHrbRjsJgMFcq0an6AqdthM1QyIiTqNJ7J4hzxmgHtDC NpUuWw4N/auCeFRFHXhLznPB3n40xLMLAX9s+FlwML9XUlQjz4bF+74kQAQpEaNBNInQ dsQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=cOTR8y/1ZJOU1fs6sEypTctwsb7sybxbMbZYop3snL8B0/tjTqZpa7dXzHjXcV9Beg 3GSDy7Mb+eHRMpxuhj+GtxPw9mqFIkmZN/ZVo6X4RPuUM3YqLhyjdI0RCxJUhzT2jPf0 4Aq4ySOfs1w6/7uUillFR5XvDN3BeK7muBIJv8IzkXpnMfHjfHPiXW9SS8PtT321iYeH YmHnnQiS4KJlM5h5GDYmBduQG96HKiZrydz264KTN7urDE4fPS+ZiyYw+quYXMlGIdLX 6LErzch5DuGEsXYC1rClj+k9Y8oPpISZzbv7rU7rBLQy51iGXQce5RezNMOFRbNXvpMY wLkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aiV8TkfB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n20-v6si5991491qtp.123.2018.07.05.09.24.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:24:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aiV8TkfB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb73h-0007l1-PL for patch@linaro.org; Thu, 05 Jul 2018 12:24:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6sr-0008On-8C for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6sm-0007VB-Ve for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:29 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:53581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6sm-0007Uh-Ou for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:24 -0400 Received: by mail-wm0-x241.google.com with SMTP id b188-v6so12183805wme.3 for ; Thu, 05 Jul 2018 09:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=aiV8TkfB+QvWEjrVEvVvsxgJzW/8yAU55gAMfRy27L9PDsqj3/2LYOUUR1o0ho9g3n dTcrG/tQSaoLcr2v6HcEJlfCYrv/DAenMW8pK6TAB16EW7bgusjo+ubuhxyzD8Q5s5JS G7Lz4HpkEjl/XznYqqfv3Jn/NKcdEEt3DzlsI= 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=7JwlLzZv1CYp13jC2STPkaY0Vw0VaJx1WLbx+yFrznU=; b=SzDPSy+FqzjBAxdRfdya0dAFc3XD9/dY3e+EnAWwMQVGx2D5C45gkxq/Mqqrv9qA+s LkYcYNxZA+3uQi63Oz/t+1JpJAXFmMuzjluu5bTlxgzxLEHyx354C2+AwpZgXAROf2PJ 49KspQQquko7a8K2Rw6HwtnBGMyScH8jJdW2lR/m+lAmk+dEAQneNCaWnzwml3H7K0Xr Asx8VRUekbGJBrlT6SgN0bZJTRKuZmxikMsUXyb845HKhtZlaVpOfJ/meV1v+YuX8/nh 1BXZ+zCK8sM7aZ8vWmfu/jSKEBkexA+MqeddRdn0IIwxSsttZYcagawpyzmKhVwI4DS4 gGlA== X-Gm-Message-State: APt69E2dCPXo++sM8ETMreShwFjbiod1SZtfPfnOGJqsJ+npt+QzU9rg Il+lgw1wiGMXHVgUYV0vsqxaOw== X-Received: by 2002:a1c:8010:: with SMTP id b16-v6mr4851745wmd.41.1530807203750; Thu, 05 Jul 2018 09:13:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 77-v6sm6696152wmq.22.2018.07.05.09.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:13:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A8F483E0CEF; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:26 +0100 Message-Id: <20180705160329.30386-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We default to the buildd variant as most of our images are for building. However lets give the user the ability to specify "minbase" if they want to create a simple base image for experimentation. Allowing the tweaking of DEB_URL means we can also bootstrap other Debian based OS's. For example: make docker-binfmt-image-debian-ubuntu-bionic-arm64 \ DEB_ARCH=arm64 DEB_TYPE=bionic \ DEB_VARIANT=minbase DEB_URL=http://ports.ubuntu.com/ \ EXECUTABLE=./aarch64-linux-user/qemu-aarch64 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 7c76dce663..56e1aa7a21 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -32,6 +32,15 @@ if [ -z "${DEB_TYPE}" ]; then fi +# The following allow finer grain control over the defaults +if [ -z "${DEB_VARIANT}" ]; then + DEB_VARIANT=buildd +fi + +if [ -z "${DEB_URL}" ]; then + DEB_URL="http://httpredir.debian.org/debian" +fi + # We check in order for # # - DEBOOTSTRAP_DIR pointing at a development checkout @@ -107,5 +116,5 @@ fi echo "Building a rootfs using ${FAKEROOT} and ${DEBOOTSTRAP} ${DEB_ARCH}/${DEB_TYPE}" -${FAKEROOT} ${DEBOOTSTRAP} --variant=buildd --foreign --arch=$DEB_ARCH $DEB_TYPE . http://httpredir.debian.org/debian || exit 1 +${FAKEROOT} ${DEBOOTSTRAP} --variant=$DEB_VARIANT --foreign --arch=$DEB_ARCH $DEB_TYPE . $DEB_URL || exit 1 exit 0 From patchwork Thu Jul 5 16:03:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141207 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2149934ljj; Thu, 5 Jul 2018 09:36:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdlilZ/w17PlcMzUaeOb1D/jcv3RTdi5Sbry+mSapD34ohSSHXH/NK9sohc5ekV91f/7oYj X-Received: by 2002:aed:2149:: with SMTP id 67-v6mr5938442qtc.351.1530808598542; Thu, 05 Jul 2018 09:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808598; cv=none; d=google.com; s=arc-20160816; b=0dln9yVZoYDkBdeUGJo0SLmyBmGbg9QXula3pszdIfN1+3+FQFe9s+Wg3lWF/shs7b DQgk/PyGakcWHX5k0DkMZB/qRm00ZaUjKrNI+Xxvc6I4NsWxtgW2J+bIcjBoMOH2MbI9 H/wZKhZkqhaF9rCwkWc+/MqdFBCSZNI9nWQhlPdeedkVthm7dWqL5bL79pvTY8L0B5YC 3Gmo3u68TrKB/LToH4AHpRK7ezvqJFz11h9BqLi3wfOYWiHs0rXrdWYPkAZ4LnNDeV0/ BF53slq/SxHlGfkd7fsa+JUKfmsZZwJZQL3q1WE9/G7/6RaTdvBgLdrqo0qxRQdBANsQ CKsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=MIsDdlyBpvO1ass4G6q3PCWp57+4ZsMzilLWHiOATLnfI4kPwB5FuGU1Wa+RgorWEo LvSqQE/gJj3Ywg41AHqutdXqC/aWuvJclqTSaW4mTNFV/c6r5ZRPNUuLVoWaqMVXldSF fVB/W7ATpM39CVHSSiGIwLtDjPrxgt4+EEMafYHYIUDTKfEAnt+cW6L796nxSZvxHM/x D3djE++N3Xx9aqSS7prCwa8nfPMM9xxzb3qmcCGAzapTNmOY/Beh1dlZDKxf4u7TFw0P qVC7H3yggMSQdnGyhEhUTZUJU5X1iI5BI+j8SkhVqK9d9D1MRlP8kZNQFg9JMhNSP3tm VsVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XuHyJmVw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i27-v6si6638425qte.47.2018.07.05.09.36.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:36:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XuHyJmVw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb7FF-0000et-Ub for patch@linaro.org; Thu, 05 Jul 2018 12:36:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6sr-0008Os-Bl for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6so-0007W4-Pp for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:29 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:33516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6so-0007Vj-JA for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:26 -0400 Received: by mail-wm0-x236.google.com with SMTP id z6-v6so3223880wma.0 for ; Thu, 05 Jul 2018 09:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=XuHyJmVwitvZJk6o2Il7iySx+DGR4Yh+9UoEPiEvt2zmnkGaYtSR108MPgGOvqxcRS KksHdLqR8gyDIUC1FyYmkbVi+x2LvOjWdt2/du+05L643/DKjUuy0dmS4w9vfEIDNDlI bxdpO+ppiLQG9K2jf8cxvhRwI+DIvZ43EKLKU= 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=dfamiZwUizdFYQlELVkLTTmRfXIkEI4HX3JBKPunFPc=; b=XEaGkC7mkG4AMFDDxOcAkwWri0In8rzUOGFGNAZgcILMUydwcSu4oRwDiN2U8hPY6N mV7QNLu8Tu71WYE6/WoTaYyzGz8xptJZ8krYfBOUO6RVuPK08zS/n38Braf+/yL6ucX7 JC+h71oXUkWpcggpjlGecPNNbD/qsZjjOFPB4Z0RpnF57DyFsFQiDR7tBwWf4QxytzLk VEV5xYINZNKC9JKBXFuW5m+4prKeBb6wpo0ghPaStXXohqNHAimpmsFT9xUq0eroZqY0 FRHeMbWs+FKLyLkzZT1pUzzB/QSrhhzfxoTT7goe6+1igdTBxHO/6V7K60ST9lP7m/BB vtFw== X-Gm-Message-State: APt69E3ewYrD1eugbQ4jf7F7R78lTw+KIO7mJdEN51It95hT6cMbgaL6 COW+tEWuXb65+2k18cZ5aI4Nmw== X-Received: by 2002:a1c:5752:: with SMTP id l79-v6mr4246298wmb.103.1530807205603; Thu, 05 Jul 2018 09:13:25 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z9-v6sm12388437wre.49.2018.07.05.09.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:13:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BB7B13E0D20; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:27 +0100 Message-Id: <20180705160329.30386-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PULL v3 18/20] docker: add special handling for FROM:debian-%-user targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These will have been build with debootstrap so we need to check against the debian-bootstrap dockerfile. This does mean sticking to debian-FOO-user as the naming conventions for boot-strapped images. The actual cross image is built on top. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index b279836154..69e7130db7 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir): _copy_with_mkdir(l , dest_dir, so_path) def _read_qemu_dockerfile(img_name): + # special case for Debian linux-user images + if img_name.startswith("debian") and img_name.endswith("user"): + img_name = "debian-bootstrap" + df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") return open(df, "r").read() From patchwork Thu Jul 5 16:03:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141204 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2143396ljj; Thu, 5 Jul 2018 09:30:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcHKKqKoSOrlAd6Vo2LyDhn2WFc/QsynUkSEu2AqjRaYq55YYFxpatJbfr1XXSE50YqzfYW X-Received: by 2002:a37:ab17:: with SMTP id u23-v6mr5637926qke.279.1530808214928; Thu, 05 Jul 2018 09:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808214; cv=none; d=google.com; s=arc-20160816; b=PN3y0IGY5yYqdCF1byw6rUFue8iX1RwL3dRHZCIpQtU1osfFI4JF4lOBGxWkjMgW9O xfYT72tPtSIWJu+vKGCv/csO6FZsal1Nrynnyz4mTFi0VFVxtTTcM4ajd02YZ5PRLv5T lz2/N2uV7g8tROvBCdbkHYe7P7qd+zOD8+yIvIq4vtrFmmUkjSS8v0WLMQEGyJq51TZO NnaqfZ1XolSGAe5M8KUIeDAEMWvg5HNpwM6WZ8nWZm7f0jcrUWDQ4lr7qX57JdQLL5aS V0SmlUF4UO2ICam/vk4A16CUzOD8TLzZebTfSCCrqGo+e6FZl5YyLew9v8se+6tNL1u+ 0nGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=oyi/ETls3YXDgNCBiRaFk5rzM/fCkqBAQGsq7+N20gQ=; b=ShPw8F36nLfxoUF68KMfnYiJk7Tq7FiUJdW0pI8s97IzE9zrjklbOkNQzITBVkhluf d+NcaLK1z/ZlwuySZK4DEuHllpiO5b5T8jU6QcvEcxPKGCiLPm5Lzftf+Jl9T5hO0NPF kNn4tESKNhuiy1v8aAbI67eJXJJwtX5lk55oRsWTAF3DSLs2PDGE6IBjnf4PiOH1910M v7KrPknHzXJ182SlcqZFjjAvFK0OxRWedrJXkt5WxXFYdFoD73seiDS+IsWGaq7WRWyr BRo+3djbldoah0HFQeloq66KV4Q7U0aGV6RN0Qx6K8LYqI5Zg9zFGstAm08OWFDJKGXF JiSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="PL0BW/aY"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o62-v6si1253983qkc.112.2018.07.05.09.30.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="PL0BW/aY"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb794-0004eY-EC for patch@linaro.org; Thu, 05 Jul 2018 12:30:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jS-0008S3-LC for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jR-00084n-LQ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:46 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33624) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jR-00084G-Eo for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:45 -0400 Received: by mail-wm0-x241.google.com with SMTP id z6-v6so3199379wma.0 for ; Thu, 05 Jul 2018 09:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oyi/ETls3YXDgNCBiRaFk5rzM/fCkqBAQGsq7+N20gQ=; b=PL0BW/aY6Owx56dTIKGh3/oNHRPMmyYD31/dQhENyuH5D3YwXy1AQWvY6jrU7JbTAB uYisA5QXv55JC6MliSzDJXXuFNYyBnQh2QxAB3nuhiL9D8ctcix9mjlRVlnZ2hDxEVvr /KVGeuoezMomHG1NMytFBFcUg98hQujPwB4pY= 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=oyi/ETls3YXDgNCBiRaFk5rzM/fCkqBAQGsq7+N20gQ=; b=NadI3wlE5kkKTyI8kVhBn0S+ApdfBark4KvmQeu6QefE5IKGhBsaV4fpOYNa16n0o8 j3E6I3oOCUjarug1lwuE+JI1zMsrdQsVTbShu6hcjoLNqexGIf+Cvzd2+3WGZUyO1c2Z 6FDzp1NPYIRxAITPY0hLoMV0tVCdFphrChC/63gfqmIcNf5HfHB7ragWwkCqQZ2m+F25 N7n4Xrc/bWx2lUqv5T53klCAwRpSkKE9BzywVYhSnLNsG4JOjj/MD/6ZQ+WsKPRUQJ/o vw/sKJPop28WBHI6ILDlSGb63S+d5kmN4poCAsYlTEDzrgxfs6Y5NWpp5OCaQS7S8CK3 qDLw== X-Gm-Message-State: APt69E1ATwg18iyTtpY8LyvSrP/KXdu0Bpz0dLB5IIdje0yxmaoQkH32 /hUSPSDtWq8Gu57YTMpvTg3rFg== X-Received: by 2002:a1c:7c13:: with SMTP id x19-v6mr4807847wmc.27.1530806624400; Thu, 05 Jul 2018 09:03:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h12-v6sm2529090wmb.3.2018.07.05.09.03.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CDE5D3E0D43; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:28 +0100 Message-Id: <20180705160329.30386-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL v3 19/20] docker: add special rule for deboostrapped images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We might as well have a custom rule for this. For one thing the dependencies are different. As the primary dependency for docker-image-% could never be docker-image-debian-bootstrap we can drop that test in the main rule as well. Missing EXECUTABLE, DEB_ARCH and DEB_TYPE are treated as hard faults now. We also error out if the EXECUTABLE file isn't there. We should really do this with a dependency on any source rules but currently subdir-FOO-linux-user isn't enough on a clean build. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 942d05649f..7b99df5464 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -46,9 +46,6 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "CHECK", "$*") else docker-image-%: $(DOCKER_FILES_DIR)/%.docker - @if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; then \ - echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ - fi $(call quiet-command,\ $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ @@ -56,6 +53,27 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") + +# Special rule for debootstraped binfmt linux-user images +docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker + $(if $(EXECUTABLE),,\ + $(error EXECUTABLE not set, debootstrap of debian-$* would fail)) + $(if $(wildcard $(EXECUTABLE)),,\ + $(error Please build $(EXECUTABLE) first)) + $(if $(DEB_ARCH),,\ + $(error DEB_ARCH not set, debootstrap of debian-$* would fail)) + $(if $(DEB_TYPE),,\ + $(error DEB_TYPE not set, debootstrap of debian-$* would fail)) + $(call quiet-command, \ + DEB_ARCH=$(DEB_ARCH) \ + DEB_TYPE=$(DEB_TYPE) \ + $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)") + endif # Enforce dependencies for composite images From patchwork Thu Jul 5 16:03:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141219 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2155058ljj; Thu, 5 Jul 2018 09:42:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcWaYA4cNI3n4Q1fjLAjjNDkHqOdS6LUA/5DErt8GT4RrQ7LlnY+LMPlOR5ELcxALHA3EI4 X-Received: by 2002:ac8:7107:: with SMTP id z7-v6mr5724185qto.326.1530808920884; Thu, 05 Jul 2018 09:42:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808920; cv=none; d=google.com; s=arc-20160816; b=up0Vsoi0CG97SfyPyfNAju7sA0CoCUL7CIKPIL/w+piZgmbjL1PmgV8jPlHL6Hds0J fjQ5hx5yccbtAl2acHtt+Qce2aQA1VcDBrcP/XqW3b6/c0hF4vEz0jIx7AtRArEWC5x4 CAb5PZnozbJ1l8spw/2ZQhaFsAjFewClYncoPgLVxwmELAhIV4Xag9LVEkyzggMuphiw oRZVBZV85ncNnrr+9uiENiy3NJEHNwXkaX85KRsRy4g+xNxrGIDkbtmk0dG5M4gLFAJc wX+Uko2bQk3r0NmzBDeJCW0WPf35gkqabxJwjjhQX67gZw5i3k7Vzxq7Jfz/gxXJtSOD d1EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=JqVtxOTGhjMufhAf3DCbeKR9+u4+atgbjvi0esAT4bI=; b=ljasBV6ndQGwdaIRB019C1r7BIQwWGr8G/A1qnD5l12S3VQN5Iivbja+bmsnuGm59H y3yUK//N9y5pJFCPpajHsx6YLMwgZDt7f99b44LoFPl3+Epf6thOrtTTbjygqRz8SmjF QOzFm4CU5PL6afoBMoqoEnD9tf4OJK82grkRmhqaVMx2B+Nu3H2pqCKMRKdTfGKn4WRf rZHwkc0rc6sCOq9SpZ5VWm6vSzhP5CTzExt8NRhln2ANmkZSDnNfPvMhiggRo/tKKKg5 Bcn1pX/3DmqY+4jhphBsyPv88y5O6pw1n4HcrZobCw+OK/bFJLoZszf9dEgEvFJ2O9Yl g5bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XN1BYqvc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e185-v6si941628qkb.291.2018.07.05.09.42.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:42:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XN1BYqvc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb7KS-0004L9-6Z for patch@linaro.org; Thu, 05 Jul 2018 12:42:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6ss-0008QF-OV for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6sp-0007WZ-RF for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:30 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:51088) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6sp-0007WA-Gt for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:13:27 -0400 Received: by mail-wm0-x233.google.com with SMTP id v25-v6so12197890wmc.0 for ; Thu, 05 Jul 2018 09:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JqVtxOTGhjMufhAf3DCbeKR9+u4+atgbjvi0esAT4bI=; b=XN1BYqvcGPXybmSqDWMWTrwGUag4F6LgHNYAdlQ3DkTdReFNZkO2f7Nm1AjVPfnhIy wOWtEqvXeB0lwp2gLipkLLvaecdRLTCOb61MN7IG028EysIk2xjS8guIDBuq0y/NSlFT 9TkwSpH102VH9Krorfq9hbdqU2hmLT03ASXrE= 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=JqVtxOTGhjMufhAf3DCbeKR9+u4+atgbjvi0esAT4bI=; b=PPgtoN+kkxAcbw9q2mqTDpkiYLWHXeUG9FfI2pHmskG4B5PYWpe50z5OQswV9Ugm+c O498kNsZZ3iRs1GfDrmztooBABvzQD8KCzd24slmCXawG5sYjjFiYtdHICuJZMiaDE+k 4ld+EqeYb6ccGUJDsGG+3av0phJIqrW+N9wt9c+B7NsWT1Hxj6/QFvVbExfPvHHqHYxl zLDyxqR++2OOpHSVK4W9yiyfkg1+sq4t03gR3uGemO3x5RSxOqJNSY5cVV0pEiYpEekp CLPTaStnINEGCkuEJ2TfUTlFgAeNBL2zOx4zWj23ytaa/RLRI9jNTX2Vf8gMdni06KMl q1pA== X-Gm-Message-State: APt69E33l9eJoJ0godV2oaBQ3MJlGsJ90nuYAuzAXeL5XEH5yUII8OgU GNWCJdwuXnTT/4kMJLS9Pb8eGQ== X-Received: by 2002:a1c:d92:: with SMTP id 140-v6mr4301621wmn.32.1530807206493; Thu, 05 Jul 2018 09:13:26 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k188-v6sm8835014wmd.47.2018.07.05.09.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:13:22 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E38913E0DDA; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:29 +0100 Message-Id: <20180705160329.30386-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL v3 20/20] docker: add linux-user powered cross builder for QEMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 its existence when we can't build it from scratch. However this does mean you don't have to keep a static powerpc-linux-user in your active configuration just to update the cross build image. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7b99df5464..b2a7e761cc 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -64,15 +64,19 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(error DEB_ARCH not set, debootstrap of debian-$* would fail)) $(if $(DEB_TYPE),,\ $(error DEB_TYPE not set, debootstrap of debian-$* would fail)) - $(call quiet-command, \ - DEB_ARCH=$(DEB_ARCH) \ - DEB_TYPE=$(DEB_TYPE) \ - $(DOCKER_SCRIPT) build qemu:debian-$* $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ - $(if $(NOUSER),,--add-current-user) \ - $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ - $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ - "BUILD","binfmt debian-$* (debootstrapped)") + $(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)), \ + $(call quiet-command, \ + DEB_ARCH=$(DEB_ARCH) \ + DEB_TYPE=$(DEB_TYPE) \ + $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)"), \ + $(call quiet-command, \ + $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<, \ + "CHECK", "debian-$* exists")) endif @@ -117,6 +121,21 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# Rules for building linux-user powered images +# +# These are slower than using native cross compiler setups but can +# work around issues with poorly working multi-arch systems and broken +# packages. + +# Jessie is the last supported release for powerpc, but multi-arch is +# broken so we need a qemu-linux-user for this target +docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc +docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie +docker-binfmt-image-debian-powerpc-user: QEMU_TARGET = ppc-linux-user +docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc +docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user +DOCKER_USER_IMAGES += 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), \ @@ -146,6 +165,11 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' +ifneq ($(DOCKER_USER_IMAGES),) + @echo + @echo 'Available linux-user images (docker-binfmt-image-debian-%):' + @echo ' $(DOCKER_USER_IMAGES)' +endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker new file mode 100644 index 0000000000..6938a845ee --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -0,0 +1,15 @@ +# +# 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 echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu