From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c12Qh-0004Kv-0F for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c12Qd-0004Fm-Ti for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:34:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c12Qd-0004Fb-O6 for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:34:27 -0400 Date: Mon, 31 Oct 2016 10:34:23 +0800 From: Fam Zheng Message-ID: <20161031023423.GI30303@lemon> References: <20161028163339.31096-1-alex.bennee@linaro.org> <20161028163339.31096-7-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20161028163339.31096-7-alex.bennee@linaro.org> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org On Fri, 10/28 17:33, Alex Benn=E9e wrote: > No we can query what has and hasn't been built we can make this list > available in the help text. This is useful as some of the bootstrapped > builds can take some time to build. I'm not sure how useful it is to list built images without checking if it= 's in sync with the dockerfile: we still rebuild outdated ones even they're bui= lt. >=20 > Signed-off-by: Alex Benn=E9e > --- > tests/docker/Makefile.include | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) >=20 > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.incl= ude > index bb9e078..a19991b 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -80,6 +80,10 @@ docker-image-debian-%: $(DOCKER_FILES_DIR)/debian-bo= otstrap.docker > --include-executable=3D$(QEMU_EXEC),\ > "BUILD USER","$*") > =20 > +DOCKER_USER_IMAGES :=3D debian-stable-armhf debian-stable-arm64 > +DOCKER_BUILT_IMAGES :=3D $(shell $(SRC_PATH)/tests/docker/docker.py im= ages --repo qemu) > +DOCKER_UNBUILT_IMAGES :=3D $(filter-out debian-bootstrap, $(filter-out= $(DOCKER_BUILT_IMAGES), $(DOCKER_USER_IMAGES) $(DOCKER_IMAGES))) > + > docker: > @echo 'Build QEMU and run tests inside Docker containers' > @echo > @@ -96,8 +100,11 @@ docker: > @echo ' docker-image-IMAGE: Build image "IMAGE".' > @echo ' docker-run: For manually running a "TEST" with "I= MAGE"' > @echo > - @echo 'Available container images:' > - @echo ' $(DOCKER_IMAGES)' > + @echo 'Available built container images:' > + @echo ' $(DOCKER_BUILT_IMAGES)' > + @echo > + @echo 'Available (but unbuilt) container images:' > + @echo ' $(DOCKER_UNBUILT_IMAGES)' > @echo > @echo 'Available tests:' > @echo ' $(DOCKER_TESTS)' > --=20 > 2.10.1 >=20 >=20