[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/20] docker: filter out linux-user builds for mingw
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 11/20] docker: filter out linux-user builds for mingw |
Date: |
Tue, 3 Jul 2018 11:14:35 +0100 |
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 <address@hidden>
Cc: Paolo Bonzini <address@hidden>
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
address@hidden: 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-\(address@hidden)@\(.*\)/\1/')
docker-run-%: IMAGE = $(shell echo '$@' | sed -e
's/docker-run-\(address@hidden)@\(.*\)/\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)
--
2.17.1
- [Qemu-devel] [PULL 17/20] docker: debian-bootstrap.pre allow customising of variant/url, (continued)
- [Qemu-devel] [PULL 17/20] docker: debian-bootstrap.pre allow customising of variant/url, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 10/20] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 12/20] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 09/20] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 19/20] docker: add special rule for deboostrapped images, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 18/20] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 20/20] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 14/20] docker: Clean the MXE base image, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 15/20] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 13/20] docker: ubuntu: Use SDL2, Alex Bennée, 2018/07/03
- [Qemu-devel] [PULL 11/20] docker: filter out linux-user builds for mingw,
Alex Bennée <=
- [Qemu-devel] [PULL 16/20] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/07/03
- Re: [Qemu-devel] [PULL 00/20] Travis, Code Coverage and Cross Build updates, Paolo Bonzini, 2018/07/03
- Re: [Qemu-devel] [PULL 00/20] Travis, Code Coverage and Cross Build updates, Alex Bennée, 2018/07/04