From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVewL-0001y9-G7 for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVewK-0003Sh-Fi for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:41:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVewK-0003Sc-AJ for qemu-devel@nongnu.org; Tue, 16 Feb 2016 07:41:12 -0500 From: Fam Zheng Date: Tue, 16 Feb 2016 20:39:59 +0800 Message-Id: <1455626399-7111-16-git-send-email-famz@redhat.com> In-Reply-To: <1455626399-7111-1-git-send-email-famz@redhat.com> References: <1455626399-7111-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 15/15] tests/docker/Makefile.include: snapshot the src for docker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, jsnow@redhat.com, stefanha@redhat.com, sw@weilnetz.de, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , david@gibson.dropbear.id.au From: Alex Benn=C3=A9e Instead of providing a live version of the source tree to the docker container we snapshot it with git-archive. This ensure the tree is in a pristine state for whatever operations the container is going to run on them. Uncommitted changes known to files known by the git index will be included in the snapshot if there are any. Signed-off-by: Alex Benn=C3=A9e [Generate an unique directory under /tmp/ - Fam Zheng] Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.includ= e index aaf7d23..7cc2130 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -2,7 +2,7 @@ =20 $(if $(quiet-command),,$(eval include $(SRC_PATH)/rules.mak)) =20 -.PHONY: docker docker-test docker-clean docker-image +.PHONY: docker docker-test docker-clean docker-image docker-qemu-src =20 DOCKER_SUFFIX :=3D .docker =20 @@ -16,6 +16,21 @@ DOCKER_TOOLS :=3D travis =20 TESTS ?=3D % IMAGES ?=3D % +SRC_COPY :=3D $(shell mktemp -u /tmp/qemu-src.XXXXX) + +.PHONY: $(SRC_COPY) + +$(SRC_COPY): + @mkdir -p $@ + $(call quiet-command, \ + mkdir -p $@ && (if git diff-index --quiet HEAD -- &>/dev/null; then \ + git archive -1 HEAD --format=3Dtar.gz; \ + else \ + git archive -1 $$(git stash create) --format=3Dtar.gz; \ + fi) | tar -xz -C $@, \ + " COPY SRC $@") + +docker-qemu-src: $(SRC_COPY) =20 $(foreach i,$(DOCKER_IMAGES), \ $(eval docker-image: docker-image-$i) \ @@ -23,8 +38,7 @@ $(foreach i,$(DOCKER_IMAGES), \ $(eval .PHONY: docker-image-$i docker-@$i) \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ - $(eval docker-$t@$i: docker-image-$i) \ - $(eval docker-$t@$i: docker-run-$t@$i) \ + $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ $(eval docker-@$i: docker-$t@$i) \ $(eval docker-test: docker-run-$t@$i) \ ) \ @@ -73,7 +87,7 @@ docker-image-%: =20 docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*= \)@\(.*\)/\2/') -docker-run-%: +docker-run-%: docker-qemu-src @if test -z "$(IMAGE)" || test -z "$(CMD)"; \ then echo "Invalid target"; exit 1; \ fi --=20 2.4.3