From patchwork Tue Jul 3 10:14:35 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: 140949 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp988140ljj; Tue, 3 Jul 2018 03:30:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc8OAaTpu9iacgLJd+Qdj/MQFprAe029Imzw9t8iWE7fnWh0WijtIRi629tg7J4B6kxT7q6 X-Received: by 2002:a37:7141:: with SMTP id m62-v6mr24728556qkc.110.1530613839331; Tue, 03 Jul 2018 03:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613839; cv=none; d=google.com; s=arc-20160816; b=NpJUb35D/19keeUW1TW5N0BKGj8fqxUT0C1juN39UVsdFhXB53RkD0EyqwVBVow2AZ lklGf9d5La09SOF51pWln/pe79623XutiEZXBP4FnxhRHy7CzkPsnYTRwJk7lHAH614U 7emeuC2/hYAV7Jts/YFFT/LZuWBdQiVdsjStk7k4jbEV2kPwQIcaOBlyCDmwY3bnV/UT 5Boty6+TZ3na1HFWv4Yd1pbhs5pL9k1o/GzBd+mXJqxV5TQpsvjhZD2a+0OzU/Cc/zZh bABdBH9hrkXxOjZ1ctxBalVbC3PjIk0pv43Z7c8/gZYHpPsUmg94XGHkhQY+g7EtL4Zo WPMA== 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=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=SrfyVXD/CeCmnMCI6DAENOyWOBOhgpaFJVnPvVz0M+BQYJo1u1sOEf6VUkFH7djSni MKjyPe9u7EEcLNOgSguMYTq4peoTb6TBquoS3EGNjWyRwZbq6aFpZKCjZQJfqpwp4Djk XFOoG+i6tqJtMjnTD08pBpQ7eVh5Yq04w6XR1DIjjLEGB8TBP546Uz5RuSd8At+N4Uek l25rWmrEtK1+NIjZkvDPjwrutP5e464/bliS08DWMFL1O0PtJJhjqIX53VERxtaYWx5+ dXY6SJjHK2Cv2ffmmuHmne+DizHGyI6oXAtbm6ai9bRzJ7eCVWaPf1dv3Zz3xrUi7FP5 2vrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IfODDjzA; 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 m32-v6si731599qvg.182.2018.07.03.03.30.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:30:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IfODDjzA; 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]:39437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIZy-0002Yj-LJ for patch@linaro.org; Tue, 03 Jul 2018 06:30:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISs-0004dV-A8 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISr-0004Zj-5y for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:18 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:39467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISq-0004ZH-VV for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:17 -0400 Received: by mail-wm0-x233.google.com with SMTP id p11-v6so1661998wmc.4 for ; Tue, 03 Jul 2018 03:23:16 -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=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=IfODDjzA652SHaUTqtKlYmrJ0DAY50aDgShrwlLk6+MqWzIrIaHqW/j0F70WAive4I 8I++YSylwLp/rEWSAOC2FHQRXo1lOwKNFArc1qdnbB2yPGi8D3izTULRYRzMSoyn3FnD EY6Y+fJbH6C0XtwjlpqedYeiWr+1DMX19q+kQ= 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=IIxA5T5BGH3jy50BU07HFooNkyxX3SccLp9XKgAyF8A=; b=FN7tSeOReaRnb/fXErfUteRvZcgK6CYj8D6U2eu7HcGYSWHd7MamwYUVUTqxm8ggHD VJc93Fgo9WGDNQKMvOkBZbo/AeWz3BGN0Hp15jANPvS+RC10RuUSMvRFxRbPQlMimdjI rgdZK2IS/IRga5WQWu/ftSlkOukhX24fqotRAAwlftXLknhqRaUW/7sQWSL5Yy5Rezmh 2pc5Cv1VDTB1LcOv54zhESjQjQHuWVo+XJD9Sxls+TPy1qdXcRvJ/My4JITBD4+YhA2v MVc1TM/kJC/mBzCAeTGeYwFfd9X5dyE1knIql3okUr53+4CS7aYaxxySrr9k/IwIVJiy nRoA== X-Gm-Message-State: APt69E0EQtTgKOjwPiZ2iU5thhQbneYllO0DVzsm+mgG3VZNmilrMcD3 18UB7FPHHv1jLvYjgid5NGMFTg== X-Received: by 2002:a1c:850c:: with SMTP id h12-v6mr10112913wmd.116.1530613395872; Tue, 03 Jul 2018 03:23:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r140-v6sm1424647wmd.27.2018.07.03.03.23.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6AF3B3E07B9; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:35 +0100 Message-Id: <20180703101444.23778-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-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 11/20] docker: filter out linux-user builds for mingw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, Paolo Bonzini , famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent change from TARGET_DIRS to TARGET_LIST (208ecb3e1) had the effect of defaulting all docker builds to the current configured set of targets. This is actually reasonable behaviour but does run into problems if you have linux-user builds configured and you want to test the windows cross builds. This commit fixes that by adding a DOCKER_FILTER_TARGETS variable which is special-cased for mingw builds so we don't pass the whole set down. Signed-off-by: Alex Bennée Cc: Paolo Bonzini -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..1813ec0781 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,6 +20,9 @@ DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py TESTS ?= % IMAGES ?= % +# This is used to filter targets from some docker builds +DOCKER_FILTER_TARGETS ?= + CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) @@ -108,6 +111,12 @@ $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ ) \ ) +# Special cases +# mingw/windows builds cannot build linux-user +docker-%-win32-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-%-win64-cross: DOCKER_FILTER_TARGETS = %-linux-user +docker-test-mingw@%: DOCKER_FILTER_TARGETS = %-linux-user + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -174,7 +183,7 @@ docker-run: docker-qemu-src $(if $V,,--rm) \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ - -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ + -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(filter-out $(DOCKER_FILTER_TARGETS),$(TARGET_LIST))) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ @@ -195,7 +204,8 @@ docker-run: docker-qemu-src docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) + @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) DOCKER_FILTER_TARGETS=$(DOCKER_FILTER_TARGETS) + docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean)