From: Fam Zheng <famz@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, sw@weilnetz.de,
qemu-devel@nongnu.org, stefanha@redhat.com,
Paolo Bonzini <pbonzini@redhat.com>,
jsnow@redhat.com, david@gibson.dropbear.id.au
Subject: Re: [Qemu-devel] [PATCH 02/12] Makefile: Rules for docker testing
Date: Mon, 15 Feb 2016 21:52:28 +0800 [thread overview]
Message-ID: <20160215135228.GC18222@ad.usersys.redhat.com> (raw)
In-Reply-To: <87bn7inv7v.fsf@linaro.org>
On Mon, 02/15 10:06, Alex Bennée wrote:
>
> Fam Zheng <famz@redhat.com> writes:
>
> > This adds a group of make targets to run docker tests, all are available
> > 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= and IMAGES=, which are expressed in Makefile pattern syntax,
> > "foo% %bar ...". For example:
> >
> > $ make docker-run IMAGES="ubuntu fedora"
>
> This could do with repeating in the docs so that you don't need to
> search commits for example invocations.
Okay.
>
> >
> > Unfortunately, it's impossible to propagate "-j $JOBS" into make in
> > containers, however since each combination is made a first class target
> > is the top Makefile, "make -j$N docker-run" still parallels the tests
> > coarsely.
> >
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> > Makefile | 4 +-
> > tests/docker/Makefile.include | 88 +++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 91 insertions(+), 1 deletion(-)
> > create mode 100644 tests/docker/Makefile.include
> >
> > diff --git a/Makefile b/Makefile
> > index d0de2d4..7da70f4 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -6,7 +6,7 @@ BUILD_DIR=$(CURDIR)
> > # Before including a proper config-host.mak, assume we are in the source tree
> > SRC_PATH=.
> >
> > -UNCHECKED_GOALS := %clean TAGS cscope ctags
> > +UNCHECKED_GOALS := %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.include
> > new file mode 100644
> > index 0000000..ca84c35
> > --- /dev/null
> > +++ b/tests/docker/Makefile.include
> > @@ -0,0 +1,88 @@
> > +# Makefile for Docker tests
> > +
> > +$(if $(quiet-command),,$(eval include $(SRC_PATH)/rules.mak))
> > +
> > +.PHONY: docker docker-build docker-run docker-clean
> > +
> > +DOCKER_SUFFIX = .docker
> > +
> > +DOCKER_IMAGES := $(patsubst %$(DOCKER_SUFFIX),%, $(shell \
> > + ls $(SRC_PATH)/tests/docker/ | grep '$(DOCKER_SUFFIX)$$'))
> > +
> > +DOCKER_SCRIPTS := $(shell ls $(SRC_PATH)/tests/docker/ | grep '\.sh$$')
> > +DOCKER_TESTS := $(filter test-%, $(DOCKER_SCRIPTS))
> > +DOCKER_TOOLS := $(filter-out test-%, $(DOCKER_SCRIPTS))
> > +
> > +TESTS ?= %
> > +IMAGES ?= %
> > +
> > +$(foreach i,$(DOCKER_IMAGES), \
> > + $(eval docker-build: docker-build-$i) \
> > + $(foreach t,$(DOCKER_SCRIPTS), \
> > + $(eval docker-build-$i docker-run-$t@$i: IMAGE=$i) \
> > + $(eval docker-run-$t@$i: SCRIPT=$t) \
> > + $(eval docker-run-$t@$i: docker-build-$i) \
> > + $(if $(filter test-%,$t), \
> > + $(eval docker-run: docker-run-$t@$i) \
> > + $(eval docker-run-$t@: docker-run-$t@$i) \
> > + $(eval docker-run-@$i: docker-run-$t@$i)) \
> > +))
> > +
> > +docker:
> > + @echo 'Building QEMU and running tests or tools inside Docker containers'
> > + @echo
> > + @echo 'Available targets:'
> > + @echo
> > + @echo ' docker: Print this help.'
> > + @echo ' docker-run: Run all image/test combinations.'
> > + @echo ' You can override the test cases to run by providing'
> > + @echo ' TESTS="foo bar" in the make command, and the image set'
> > + @echo ' by providing IMAGES="baz qux".'
> > + @echo ' docker-clean: Kill and remove residual docker testing containers.'
> > + @echo ' docker-build: Build all images.'
> > + @echo ' docker-build-IMG: Build image "IMG".'
> > + @echo ' "IMG" is one of the listed image name."'
> > + @echo ' docker-run-FOO@BAR: Run "FOO" in container "BAR".'
> > + @echo ' "FOO" must be one of the listed test/tool name."'
> > + @echo ' "BAR" must be one of the listed image name."'
> > + @echo ' docker-run-FOO@: Run "FOO" in all containers.'
> > + @echo ' "FOO" must be one of the listed test name."'
> > + @echo ' docker-run-@BAR: Run all tests in container "BAR".'
> > + @echo ' "BAR" must be one of the listed image name."'
> > + @echo
> > + @echo 'Available images:'
> > + @echo ' $(DOCKER_IMAGES)'
> > + @echo
> > + @echo 'Available tests:'
> > + @echo ' $(DOCKER_TESTS)'
> > + @echo
> > + @echo 'Available tools:'
> > + @echo ' $(DOCKER_TOOLS)'
>
> I commend the addition of help ;-)
>
> Perhaps replace FOO and BAR with TEST and IMAGE to cement the actual
> rather than the abstract in the readers mind.
OK!
>
> Also I expected this to work:
>
> $ make docker-run-basic@fedora
> Invalid target
> make: *** [docker-run-basic@fedora] Error 1
>
> The help gives:
>
> Available images:
> centos6 fedora ubuntu
>
> Available tests:
> test-basic.sh test-clang.sh test-mingw.sh
>
> Available tools:
> travis.sh
>
> The test and .sh seem superfluous to the user wanting to invoke things.
> We know they are tests and the implementation detail of the shell should
> be irrelevant to the user.
I want to distinguish tests from usual tools by prefix (test-). Tools
shouldn't be invoked by "make docker-run".
I'll remove the .sh suffixes, and "s/docker-run-FOO/docker-FOO/". Then you
just:
$ make docker-test-basic@fedora
$ make docker-travis@fedora
Thanks,
Fam
next prev parent reply other threads:[~2016-02-15 13:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 9:24 [Qemu-devel] [PATCH 00/12] tests: Introducing docker tests Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 01/12] tests: Add utilities for docker testing Fam Zheng
2016-02-08 21:49 ` John Snow
2016-02-09 2:01 ` Fam Zheng
2016-02-09 23:16 ` John Snow
2016-02-14 5:10 ` Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 02/12] Makefile: Rules " Fam Zheng
2016-02-15 10:06 ` Alex Bennée
2016-02-15 13:52 ` Fam Zheng [this message]
2016-02-15 14:13 ` Alex Bennée
2016-02-05 9:24 ` [Qemu-devel] [PATCH 03/12] docker: Add images Fam Zheng
2016-02-15 10:15 ` Alex Bennée
2016-02-15 13:44 ` Fam Zheng
2016-02-15 14:12 ` Alex Bennée
2016-02-05 9:24 ` [Qemu-devel] [PATCH 04/12] docker: Add test runner Fam Zheng
2016-02-15 10:55 ` Alex Bennée
2016-02-15 12:45 ` Alex Bennée
2016-02-15 13:29 ` Fam Zheng
2016-02-15 14:10 ` Alex Bennée
2016-02-16 2:52 ` Fam Zheng
2016-02-16 6:00 ` Fam Zheng
2016-02-16 8:20 ` Alex Bennée
2016-02-05 9:24 ` [Qemu-devel] [PATCH 05/12] docker: Add common.rc Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 06/12] docker: Add basic test Fam Zheng
2016-02-15 14:34 ` Alex Bennée
2016-02-15 14:42 ` Peter Maydell
2016-02-15 14:52 ` Alex Bennée
2016-02-16 1:15 ` Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 07/12] docker: Add clang test Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 08/12] docker: Add mingw test Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 09/12] docker: Add travis tool Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 10/12] docs: Add text for tests/docker in build-system.txt Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 11/12] .gitignore: Ignore temporary dockerfile Fam Zheng
2016-02-15 14:42 ` Alex Bennée
2016-02-16 2:43 ` Fam Zheng
2016-02-05 9:24 ` [Qemu-devel] [PATCH 12/12] MAINTAINERS: Add tests/docker Fam Zheng
2016-02-15 14:36 ` Alex Bennée
2016-02-10 11:23 ` [Qemu-devel] [PATCH 00/12] tests: Introducing docker tests Alex Bennée
2016-02-14 5:22 ` Fam Zheng
2016-02-15 17:59 ` Alex Bennée
2016-02-16 2:42 ` Fam Zheng
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=20160215135228.GC18222@ad.usersys.redhat.com \
--to=famz@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=david@gibson.dropbear.id.au \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=sw@weilnetz.de \
/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).