qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, 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,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PULL v2 09/57] docker: Makefile.include introduce DOCKER_SCRIPT
Date: Thu, 21 Jun 2018 07:25:17 +0100	[thread overview]
Message-ID: <20180621062605.941-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org>

Define this in one place to make it easy to re-use.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 74fd51c22c..8afb383478 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -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)
-- 
2.17.1

  parent reply	other threads:[~2018-06-21  6:26 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-21  6:25 [Qemu-devel] [PULL v2 00/57] add check-tcg and associated machinery Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3 Alex Bennée
2018-06-21  8:49   ` Peter Maydell
2018-06-21  9:13     ` Daniel P. Berrangé
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 02/57] configure: add support for --cross-cc-FOO Alex Bennée
2019-08-20 13:32   ` Peter Maydell
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 03/57] configure: move i386_cc to cross_cc_i386 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 04/57] configure: allow user to specify --cross-cc-cflags-foo= Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 05/57] configure: set cross_cc_FOO for host compiler Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 06/57] docker: Add "cc" subcommand Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 07/57] docker: extend "cc" command to accept compiler Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 08/57] docker: allow "cc" command to run in user context Alex Bennée
2018-06-21  6:25 ` Alex Bennée [this message]
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 10/57] tests/tcg: move architecture independent tests into subdir Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 11/57] tests/tcg/multiarch: Build fix for linux-test Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 12/57] tests/tcg/multiarch: enable additional linux-test tests Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 13/57] tests/tcg/multiarch: don't hard code paths/ports for linux-test Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 14/57] tests/tcg/multiarch: move most output to stdout Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 15/57] tests/tcg: move i386 specific tests into subdir Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 16/57] tests/tcg: enable building for i386 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 17/57] tests/tcg/i386: Build fix for hello-i386 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 18/57] tests/tcg/i386: fix test-i386 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 19/57] tests/tcg/i386: add runner for test-i386-fprem Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 20/57] tests/tcg/x86_64: add Makefile.target Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 21/57] tests/tcg/i386/test-i386: use modern vector_size attributes Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 22/57] tests/tcg/i386/test-i386: fix printf format Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 23/57] tests/tcg: move ARM specific tests into subdir Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 24/57] tests/tcg: enable building for ARM Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 25/57] tests/tcg/arm: fix up test-arm-iwmmxt test Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 26/57] tests/tcg: enable building for AArch64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 27/57] tests/tcg/arm: add fcvt test cases for AArch32/64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 28/57] tests/tcg: move MIPS specific tests into subdir Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 29/57] tests/tcg: enable building for MIPS Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 30/57] tests/docker/Makefile.include: fix mipsel-cross dependancy Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 31/57] tests/tcg/mips: include common mips hello-mips Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 32/57] tests/tcg: enable building for s390x Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 33/57] tests/tcg: enable building for ppc64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 34/57] tests/tcg: enable building for Alpha Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 35/57] tests/tcg/alpha: add Alpha specific tests Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 36/57] tests/tcg: enable building for HPPA Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 37/57] tests/tcg: enable building for m68k Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 38/57] tests/tcg: enable building for sh4 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 39/57] tests/tcg: enable building for sparc64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 40/57] tests/tcg: enable building for mips64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 41/57] tests/tcg: enable building for RISCV64 Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 42/57] docker: move debian-powerpc-cross to sid based build Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 43/57] tests/tcg: enable building for PowerPC Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 44/57] tests/tcg/Makefile: update to be called from Makefile.target Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 45/57] Makefile.target: add (clean-/build-)guest-tests targets Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 46/57] tests/Makefile.include: add [build|clean|check]-tcg targets Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 47/57] tests/tcg: add run, diff, and skip helper macros Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 48/57] tests/tcg: override runners for broken tests Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 49/57] tests/tcg/i386: extend timeout for runcom test Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 50/57] tests: add top-level make dependency for docker builds Alex Bennée
2018-06-21  6:25 ` [Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums for extra_files Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 53/57] docker: docker.py add check sub-command Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 54/57] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1 Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 55/57] docker: docker.py adding age check command Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 56/57] tests/docker/Makefile.include: only force SID to NOCACHE if old Alex Bennée
2018-06-21  6:26 ` [Qemu-devel] [PULL v2 57/57] .travis.yml: add check-tcg test Alex Bennée
2018-06-21 12:00 ` [Qemu-devel] [PULL v2 00/57] add check-tcg and associated machinery Peter Maydell
2018-06-21 12:29   ` Alex Bennée
2018-06-21 14:48   ` Alex Bennée
2018-06-21 15:01     ` Philippe Mathieu-Daudé
2018-06-21 15:12       ` Alex Bennée
2018-06-21 16:04         ` Philippe Mathieu-Daudé
2018-06-21 16:12           ` Philippe Mathieu-Daudé
2018-06-22 11:40 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180621062605.941-10-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=agraf@suse.de \
    --cc=aurelien@aurel32.net \
    --cc=balrogg@gmail.com \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=famz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).