[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/43] docker: Makefile.include introduce DOCKER_
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 11/43] docker: Makefile.include introduce DOCKER_SCRIPT |
Date: |
Thu, 19 Apr 2018 14:58:29 +0100 |
Define this in one place to make it easy to re-use.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/docker/Makefile.include | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index de87341528..6a5aa9ec71 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -14,6 +14,8 @@ DOCKER_TESTS := $(notdir $(shell \
DOCKER_TOOLS := travis
+DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py
+
TESTS ?= %
IMAGES ?= %
@@ -37,7 +39,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1
; \
fi
$(call quiet-command,\
- $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \
+ $(DOCKER_SCRIPT) build qemu:$* $< \
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
$(if $(NOUSER),,--add-current-user) \
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\
@@ -129,11 +131,11 @@ docker-run: docker-qemu-src
fi
$(if $(EXECUTABLE), \
$(call quiet-command, \
- $(SRC_PATH)/tests/docker/docker.py update \
+ $(DOCKER_SCRIPT) update \
$(IMAGE) $(EXECUTABLE), \
" COPYING $(EXECUTABLE) to $(IMAGE)"))
$(call quiet-command, \
- $(SRC_PATH)/tests/docker/docker.py run \
+ $(DOCKER_SCRIPT) run \
$(if $(NOUSER),,-u $(shell id -u)) \
--security-opt seccomp=unconfined \
$(if $V,,--rm) \
@@ -163,4 +165,4 @@ docker-run-%:
@$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE)
docker-clean:
- $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean)
+ $(call quiet-command, $(DOCKER_SCRIPT) clean)
--
2.17.0
- Re: [Qemu-devel] [PATCH v2 13/43] tests/tcg/multiarch: Build fix for linux-test, (continued)
- [Qemu-devel] [PATCH v2 35/43] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 22/43] tests/tcg/x86_64: add Makefile.target, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 16/43] docker: Add fedora-i386-cross image, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 33/43] tests/tcg: enable building for s390x, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 27/43] tests/tcg/aarch64: add Makefile.target, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 20/43] tests/tcg/i386: fix test-i386-fprem, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 24/43] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 15/43] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 11/43] docker: Makefile.include introduce DOCKER_SCRIPT,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 42/43] tests/tcg: disable fp-test for 32 bit (HACK!), Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 34/43] tests/tcg: enable building for ppc64, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 37/43] tests/Makefile.include: add (clean-)check-tcg targets, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 21/43] tests/tcg/i386: disable i386 version of test-i386-ssse, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 40/43] tests: add fp-test, a floating point test suite, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 29/43] tests/tcg/aarch64: userspace system register test, Alex Bennée, 2018/04/19
- [Qemu-devel] [PATCH v2 31/43] tests/tcg: enable building for MIPS, Alex Bennée, 2018/04/19