From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaYkG-0002LW-KO for qemu-devel@nongnu.org; Mon, 29 Feb 2016 20:05:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaYkB-0005zF-IB for qemu-devel@nongnu.org; Mon, 29 Feb 2016 20:05:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaYkB-0005zB-8G for qemu-devel@nongnu.org; Mon, 29 Feb 2016 20:04:55 -0500 Date: Tue, 1 Mar 2016 09:04:48 +0800 From: Fam Zheng Message-ID: <20160301010448.GB15213@ad.usersys.redhat.com> References: <1455626399-7111-1-git-send-email-famz@redhat.com> <1455626399-7111-3-git-send-email-famz@redhat.com> <8760x7jvgj.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <8760x7jvgj.fsf@linaro.org> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 02/15] Makefile: Rules for docker testing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: kwolf@redhat.com, peter.maydell@linaro.org, sw@weilnetz.de, qemu-devel@nongnu.org, stefanha@redhat.com, Paolo Bonzini , jsnow@redhat.com, david@gibson.dropbear.id.au On Mon, 02/29 17:08, Alex Benn=E9e wrote: >=20 > Fam Zheng writes: >=20 > > This adds a group of make targets to run docker tests, all are availa= ble > > in source tree without running ./configure. > > > > The usage is shown by "make docker". > > > > Besides the fixed ones, dynamic targets for building each image and > > running each test in each image are generated automatically by make, > > scanning $(SRC_PATH)/tests/docker/ files with specific patterns. > > > > Alternative to manually list particular targets (docker-run-FOO@BAR) > > set, you can control which tests/images to run by filtering variables= , > > TESTS=3D and IMAGES=3D, which are expressed in Makefile pattern synta= x, > > "foo% %bar ...". For example: > > > > $ make docker-run IMAGES=3D"ubuntu fedora" >=20 > This doesn't seem to work for me: >=20 > 16:49 alex@zen/x86_64 [qemu.git/review/docker-tests-v2] >make > docker-run IMAGES=3D"ubuntu" V=3D1 > /home/alex/lsrc/qemu/qemu.git/rules.mak:178: warning: overriding > commands for target `clean-timestamp' > /home/alex/lsrc/qemu/qemu.git/rules.mak:178: warning: ignoring old > commands for target `clean-timestamp' > make: *** No rule to make target `docker-run'. Stop. The commit message is stale, as the help text, the target is now "docker-= test" which is more intuitive. Fam > ` >=20 > > > > Unfortunately, it's impossible to propagate "-j $JOBS" into make in > > containers, however since each combination is made a first class targ= et > > is the top Makefile, "make -j$N docker-run" still parallels the tests > > coarsely. > > > > Signed-off-by: Fam Zheng > > --- > > Makefile | 4 +- > > tests/docker/Makefile.include | 93 +++++++++++++++++++++++++++++++++= ++++++++++ > > 2 files changed, 96 insertions(+), 1 deletion(-) > > create mode 100644 tests/docker/Makefile.include > > > > diff --git a/Makefile b/Makefile > > index f9fae3a..f104a08 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -6,7 +6,7 @@ BUILD_DIR=3D$(CURDIR) > > # Before including a proper config-host.mak, assume we are in the so= urce tree > > SRC_PATH=3D. > > > > -UNCHECKED_GOALS :=3D %clean TAGS cscope ctags > > +UNCHECKED_GOALS :=3D %clean TAGS cscope ctags docker docker-% > > > > # All following code might depend on configuration variables > > ifneq ($(wildcard config-host.mak),) > > @@ -651,3 +651,5 @@ endif > > # Include automatically generated dependency files > > # Dependencies in Makefile.objs files come from our recursive subdir= rules > > -include $(wildcard *.d tests/*.d) > > + > > +include $(SRC_PATH)/tests/docker/Makefile.include > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.in= clude > > new file mode 100644 > > index 0000000..d8c55c3 > > --- /dev/null > > +++ b/tests/docker/Makefile.include > > @@ -0,0 +1,93 @@ > > +# Makefile for Docker tests > > + > > +$(if $(quiet-command),,$(eval include $(SRC_PATH)/rules.mak)) > > + > > +.PHONY: docker docker-test docker-clean docker-image > > + > > +DOCKER_SUFFIX :=3D .docker > > + > > +DOCKER_IMAGES :=3D $(notdir $(basename \ > > + $(wildcard $(SRC_PATH)/tests/docker/dockerfiles/*))) > > + > > +DOCKER_TESTS :=3D $(notdir $(shell \ > > + find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f -executable)) > > + > > +DOCKER_TOOLS :=3D travis > > + > > +TESTS ?=3D % > > +IMAGES ?=3D % > > + > > +$(foreach i,$(DOCKER_IMAGES), \ > > + $(eval docker-image: docker-image-$i) \ > > + $(eval docker-image-$i: IMAGE =3D $i) \ > > + $(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-@$i: docker-$t@$i) \ > > + $(eval docker-test: docker-run-$t@$i) \ > > + ) \ > > +) > > + > > +docker: > > + @echo 'Building QEMU and running tests inside Docker containers' > > + @echo > > + @echo 'Available targets:' > > + @echo > > + @echo ' docker: Print this help.' > > + @echo ' docker-test: Run all image/test combinations.' > > + @echo ' docker-clean: Kill and remove residual docker tes= ting containers.' > > + @echo ' docker-TEST@IMAGE: Run "TEST" in container "IMAGE".' > > + @echo ' Note: "TEST" is one of the listed t= est name,' > > + @echo ' or a script name under $$QEMU_SRC/t= ests/docker/;' > > + @echo ' "IMAGE" is one of the listed contai= ner name."' > > + @echo ' docker-@IMAGE: Run all tests in container "IMAGE".= ' > > + @echo ' docker-image: Build all images.' > > + @echo ' docker-image-IMAGE: Build image "IMG".' > > + @echo > > + @echo 'Available container images:' > > + @echo ' $(DOCKER_IMAGES)' > > + @echo > > + @echo 'Available tests:' > > + @echo ' $(DOCKER_TESTS)' > > + @echo > > + @echo 'Available tools:' > > + @echo ' $(DOCKER_TOOLS)' > > + @echo > > + @echo 'Special variables:' > > + @echo ' IMAGES=3D"a b c ..": Filters which images to build or = run.' > > + @echo ' TESTS=3D"x y z .." Filters which tests to run (for d= ocker-test).' > > + @echo ' J=3D[0..9]* Overrides the -jN parameter for m= ake commands' > > + @echo ' (default is 1)' >=20 > OK none of these test targets seem to be working for me: >=20 > COPY SRC /tmp/qemu-src.JCUng > RUN test-clang in centos6 > Prerequisite 'clang' not present, skip > RUN test-mingw in centos6 > Prerequisite 'mingw' not present, skip > RUN test-quick in centos6 > make: *** [docker-run-test-quick@centos6] Error 2 >=20 > Running with V=3D1 doesn't elucidate me much further: >=20 > /home/alex/lsrc/qemu/qemu.git/rules.mak:178: warning: overriding comman= ds for target `clean-timestamp' > /home/alex/lsrc/qemu/qemu.git/rules.mak:178: warning: ignoring old comm= ands for target `clean-timestamp' > mkdir -p /tmp/qemu-src.HtY32 && (if git diff-index --quiet HEAD -- &>/d= ev/null; then git archive -1 HEAD --format=3Dtar.gz; else git archive -1 = $(git stash create) --format=3Dtar.gz; fi) | tar -xz -C /tmp/qemu-src.HtY= 32 > /home/alex/lsrc/qemu/qemu.git/tests/docker/docker_run --rm --privileged= -t --net=3Dnone -v $(realpath /home/alex/lsrc/qemu/qemu.git):/var/tmp/q= emu -e QEMU_SRC=3D/var/tmp/qemu -e V=3D1 -e J=3D -e PAUSE=3D -v /var/tmp/= qemu-docker-ccache:/var/tmp/ccache -e CCACHE_DIR=3D/var/tmp/ccache qemu:c= entos6 /var/tmp/qemu/tests/docker/run /var/tmp/qemu/tests/docker/test-cla= ng; > Prerequisite 'clang' not present, skip > /home/alex/lsrc/qemu/qemu.git/tests/docker/docker_run --rm --privileged= -t --net=3Dnone -v $(realpath /home/alex/lsrc/qemu/qemu.git):/var/tmp/q= emu -e QEMU_SRC=3D/var/tmp/qemu -e V=3D1 -e J=3D -e PAUSE=3D -v /var/tmp/= qemu-docker-ccache:/var/tmp/ccache -e CCACHE_DIR=3D/var/tmp/ccache qemu:c= entos6 /var/tmp/qemu/tests/docker/run /var/tmp/qemu/tests/docker/test-min= gw; > Prerequisite 'mingw' not present, skip > /home/alex/lsrc/qemu/qemu.git/tests/docker/docker_run --rm --privileged= -t --net=3Dnone -v $(realpath /home/alex/lsrc/qemu/qemu.git):/var/tmp/q= emu -e QEMU_SRC=3D/var/tmp/qemu -e V=3D1 -e J=3D -e PAUSE=3D -v /var/tmp/= qemu-docker-ccache:/var/tmp/ccache -e CCACHE_DIR=3D/var/tmp/ccache qemu:c= entos6 /var/tmp/qemu/tests/docker/run /var/tmp/qemu/tests/docker/test-qui= ck; > make: *** [docker-run-test-quick@centos6] Error 2 >=20 > If I drop to the shell using: >=20 > make docker-test-quick@centos6 V=3D1 PAUSE=3D1 >=20 > And run: >=20 > /var/tmp/qemu/tests/docker/test-quick >=20 > I get a cryptic silent fail. I think we need more verbosity (select-abl= e > when required) to see whats going on in the depths. >=20 > > + > > +docker-image-%: > > + @if test -z "$(IMAGE)"; then echo "Invalid target"; exit 1; fi > > + $(if $(filter $(IMAGES),$(IMAGE)), $(call quiet-command,\ > > + $(SRC_PATH)/tests/docker/docker_build qemu:$(IMAGE) \ > > + $(SRC_PATH)/tests/docker/dockerfiles/$(IMAGE).docker \ > > + $(if $V,-v,), " BUILD $(IMAGE)")) > > + > > + > > +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-%: > > + @if test -z "$(IMAGE)" || test -z "$(CMD)"; \ > > + then echo "Invalid target"; exit 1; \ > > + fi > > + $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \ > > + $(call quiet-command,\ > > + $(SRC_PATH)/tests/docker/docker_run $(if $(KEEP),,--rm) \ > > + --privileged -t --net=3Dnone \ > > + -v $$(realpath $(SRC_PATH)):/var/tmp/qemu \ > > + -e QEMU_SRC=3D/var/tmp/qemu \ > > + -e V=3D$V -e J=3D$J \ > > + -v /var/tmp/qemu-docker-ccache:/var/tmp/ccache \ > > + -e CCACHE_DIR=3D/var/tmp/ccache \ > > + qemu:$(IMAGE) \ > > + /var/tmp/qemu/tests/docker/run \ > > + /var/tmp/qemu/tests/docker/$(CMD); \ > > + , " RUN $(CMD) in $(IMAGE)"))) > > + > > +docker-clean: > > + $(call quiet-command, $(SRC_PATH)/tests/docker/docker_clean) >=20 >=20 > -- > Alex Benn=E9e