-----BEGIN PGP SIGNATURE-----
iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlnpmBUQHGZhbXpAcmVk aGF0LmNvbQAKCRDKNWJMapFxxrRTCACMaeWPviLN3InTUgqqw/Cmj8Z/lo6rxPCG MBmi3MB2pC5u5r9EXl7rsq7Vkdj5RDNafn9qPr54TiZqr2lruIErf6NlLF1r3jN0 8gjiC0KIIo2v2eEe5Uk7bqAMAyxqBz/A7W8I+vBVy3GbCRqQHRHudZPAXsfQhH1v ye9RaubB8BPnQ07znvxSB0CRNzE+Vb4c7FpjhetIKWT2WAf1ZMEp2syODo7WgK2W /Cy/GeCfC9Q+IhAcvAjJiNd/Jamm32nrOMjPxjEwcfaro0Fyny/fXTYHh+PP35du uvCIdHFKKqpS+UlooXfbofJoE8+77naN1yohvRNLQOS4Gd8RKc9S =M+EM -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
27825bc954
|
@ -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:
|
||||
#
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue