]> Git Repo - qemu.git/commitdiff
docker: Makefile.include introduce DOCKER_SCRIPT
authorAlex Bennée <[email protected]>
Fri, 6 Apr 2018 15:25:39 +0000 (16:25 +0100)
committerAlex Bennée <[email protected]>
Wed, 20 Jun 2018 19:22:34 +0000 (20:22 +0100)
Define this in one place to make it easy to re-use.

Signed-off-by: Alex Bennée <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
tests/docker/Makefile.include

index 74fd51c22c72f42fa00c0fb9d5d1d4292317f91d..8afb3834781f6060317b87d1879725fb80c4c179 100644 (file)
@@ -15,6 +15,8 @@ DOCKER_TESTS := $(notdir $(shell \
 
 DOCKER_TOOLS := travis
 
+DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py
+
 TESTS ?= %
 IMAGES ?= %
 
@@ -38,7 +40,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))\
@@ -133,11 +135,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)                                  \
@@ -167,4 +169,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)
This page took 0.02815 seconds and 4 git commands to generate.