[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 08/24] docker: Makefile.include introduce DOC
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v1 08/24] docker: Makefile.include introduce DOCKER_SCRIPT |
Date: |
Wed, 11 Apr 2018 12:10:12 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
On 04/10/2018 04:39 PM, Alex Bennée wrote:
> 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)
>
- Re: [Qemu-devel] [PATCH v1 01/24] configure: add test for docker availability, (continued)
[Qemu-devel] [PATCH v1 04/24] Makefile: Rename TARGET_DIRS to TARGET_LIST, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 02/24] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 05/24] docker: Add "cc" subcommand, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 08/24] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/04/10
- Re: [Qemu-devel] [PATCH v1 08/24] docker: Makefile.include introduce DOCKER_SCRIPT,
Philippe Mathieu-Daudé <=
[Qemu-devel] [PATCH v1 03/24] configure: move i386_cc to cross_cc_i386, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 06/24] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 07/24] docker: allow "cc" command to run in user context, Alex Bennée, 2018/04/10
[Qemu-devel] [PATCH v1 09/24] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/04/10