From nobody Tue Feb 10 04:30:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530305906344153.56989497026518; Fri, 29 Jun 2018 13:58:26 -0700 (PDT) Received: from localhost ([::1]:44434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0TJ-0004Ju-IC for importer@patchew.org; Fri, 29 Jun 2018 16:58:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Nq-00088D-75 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Np-0006VZ-6j for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:46 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38850) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0No-0006Ud-W6 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:52:45 -0400 Received: by mail-wm0-x22b.google.com with SMTP id 69-v6so3270824wmf.3 for ; Fri, 29 Jun 2018 13:52:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h1-v6sm12172160wri.90.2018.06.29.13.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:52:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A623D3E07D1; Fri, 29 Jun 2018 21:52:33 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=801BtlulI3v1N0a8n2IOnxXvo7ZXcWNkpX9cQ/Wz+H0=; b=ei/P/WFyn/JN/Xl/DVXZ0jRILddmpl82Qz/J0SrjH1fkq+biCCxmQhElABtfKE8BDl 3fs6m/ffj4l1PlRga5E9GbA3Ees++oi59n2oMZ1UDQr3Tz29XmssgL/bWvKLXz52AKa1 yCCzZX6sPuIldyOvxnapww2jUTdhMXcw9se3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=801BtlulI3v1N0a8n2IOnxXvo7ZXcWNkpX9cQ/Wz+H0=; b=o8wppsMVBRMA31fRjceHHEuDi7ujgqmrBDJZNUtwKqWN1iGM31ApHdBDMAaMOQV4Fx bA+bEVk2Uaw3YaS+IOxGnxUA4QleMRjdHjAvdkx/56ZzCMkx9+jh85NKzcl3+kQuYZUE t6roI19Ip6Z0z9wCsKA8MIKiiMzf8W3UbbdH0XXY8Q09oBFOfVm9AaqtYDs+mBV8JVWM Zr+TKtEHI7V2qrrUDOPcoUVDgyvYkjVetPcwozyp5Tz/YuyyrmDOuY8saOMD4ZpB20mj AXJOs8Q7p5gxRiDuQ5I8VkoYx15/sY9NOAYY7sgZUz9ud9IpXIGzVSmAp8Ng2RbX/NFA TrIw== X-Gm-Message-State: APt69E3A6wtgLyGWvvktw2bHzhjUwTNeCMpdc6mTsh/k1iysSSRMh8II fbJZPFEFRlbVMxBRgAYwarpwTA== X-Google-Smtp-Source: AAOMgpe+GjEph0qIV3/31qlJZa4gZiWKqCzxM59Ar1SakC0D+QvFLBbtQ9ceWL+UdTND7QvOYis54w== X-Received: by 2002:a1c:647:: with SMTP id 68-v6mr2923717wmg.82.1530305563811; Fri, 29 Jun 2018 13:52:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:22 +0100 Message-Id: <20180629205232.27190-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The recent change from TARGET_DIRS to TARGET_LIST (208ecb3e1) had the effect of defaulting all docker builds to the current configured set of targets. This is actually reasonable behaviour but does run into problems if you have linux-user builds configured and you want to test the windows cross builds. This commit fixes that by adding a DOCKER_FILTER_TARGETS variable which is special-cased for mingw builds so we don't pass the whole set down. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 91d9665517..1813ec0781 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,6 +20,9 @@ DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py TESTS ?=3D % IMAGES ?=3D % =20 +# This is used to filter targets from some docker builds +DOCKER_FILTER_TARGETS ?=3D + CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) =20 @@ -108,6 +111,12 @@ $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGE= S), \ ) \ ) =20 +# Special cases +# mingw/windows builds cannot build linux-user +docker-%-win32-cross: DOCKER_FILTER_TARGETS =3D %-linux-user +docker-%-win64-cross: DOCKER_FILTER_TARGETS =3D %-linux-user +docker-test-mingw@%: DOCKER_FILTER_TARGETS =3D %-linux-user + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -174,7 +183,7 @@ docker-run: docker-qemu-src $(if $V,,--rm) \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=3D$(NETWORK)),--net= =3Dnone) \ - -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ + -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(filter-out $(DOCKER_FILTER= _TARGETS),$(TARGET_LIST))) \ -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) \ -e SHOW_ENV=3D$(SHOW_ENV) \ @@ -195,7 +204,8 @@ docker-run: docker-qemu-src docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\= (.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) + @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) DOCKER_FILTER_TAR= GETS=3D$(DOCKER_FILTER_TARGETS) + =20 docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) --=20 2.17.1