Re: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text

[Fam Zheng]

On Fri, 10/28 17:33, Alex Bennée 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 built.

> 
> Signed-off-by: Alex Bennée <address@hidden>
> ---
>  tests/docker/Makefile.include | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> 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-bootstrap.docker
>               --include-executable=$(QEMU_EXEC),\
>               "BUILD USER","$*")
>  
> +DOCKER_USER_IMAGES := debian-stable-armhf debian-stable-arm64
> +DOCKER_BUILT_IMAGES := $(shell $(SRC_PATH)/tests/docker/docker.py images 
> --repo qemu)
> +DOCKER_UNBUILT_IMAGES := $(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 
> "IMAGE"'
>       @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)'
> -- 
> 2.10.1
> 
>