Commit 27825bc9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging 



# gpg: Signature made Fri 20 Oct 2017 07:30:45 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/docker-pull-request:
  docker: Fix PATH for ccache
  docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'
  docker: allow running from srcdir != builddir build
  docker: cleanup temp directory after test
  docker: Don't allocate tty unless DEBUG=1

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e67277f8 6a2e1197

tests/docker/Makefile.include

+7 −5
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ TESTS ?= % 
IMAGES ?= %



CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)

DOCKER_SRC_COPY := docker-src.$(CUR_TIME)

DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)



$(DOCKER_SRC_COPY):

	@mkdir $@

	$(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \

	$(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \

		"GEN", "$@/qemu.tar")

	$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \

		"COPY","RUNNER")
@@ -44,7 +44,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker 
		$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\

		"BUILD","$*")



docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh

docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh



# Enforce dependancies for composite images

docker-image-debian: docker-image-debian9
@@ -134,10 +134,10 @@ docker-run: docker-qemu-src 
			"  COPYING $(EXECUTABLE) to $(IMAGE)"))

	$(call quiet-command,						\

		$(SRC_PATH)/tests/docker/docker.py run 			\

			$(if $(NOUSER),,-u $(shell id -u)) -t 		\

			$(if $(NOUSER),,-u $(shell id -u)) 		\

			--security-opt seccomp=unconfined		\

			$(if $V,,--rm) 					\

			$(if $(DEBUG),-i,)				\

			$(if $(DEBUG),-ti,)				\

			$(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \

			-e TARGET_LIST=$(TARGET_LIST) 			\

			-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
@@ -151,6 +151,8 @@ docker-run: docker-qemu-src 
			$(IMAGE) 					\

			/var/tmp/qemu/run 				\

			$(TEST), "  RUN $(TEST) in ${IMAGE}")

	$(call quiet-command, rm -r $(DOCKER_SRC_COPY), \

		"  CLEANUP $(DOCKER_SRC_COPY)")



# Run targets:

#

tests/docker/run

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ fi 
BASE="$(dirname $(readlink -e $0))"



# Prepare the environment

export PATH=/usr/lib/ccache:$PATH

export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH



if test -n "$J"; then

    export MAKEFLAGS="$MAKEFLAGS -j$J"