Re: [Qemu-devel] [PATCH 7/9] docker: Support showing environment information

[Daniel P. Berrange]

On Wed, Sep 21, 2016 at 11:49:26AM +0800, Fam Zheng wrote:
> Add a make variable SHOW_ENV. When it's set to non empty, print the
> package information and environment variables.
> 
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  tests/docker/Makefile.include |  2 +-
>  tests/docker/run              | 11 +++++++++++
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 19d4cc7..2fcc3c6 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -117,7 +117,7 @@ docker-run-%: docker-qemu-src
>                               $(if $(DEBUG),-i,--net=none) \
>                               -e TARGET_LIST=$(TARGET_LIST) \
>                               -e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS) 
> \
> -                             -e V=$V -e J=$J -e DEBUG=$(DEBUG)\
> +                             -e V=$V -e J=$J -e DEBUG=$(DEBUG) -e 
> SHOW_ENV=$(SHOW_ENV)\
>                               -e CCACHE_DIR=/var/tmp/ccache \
>                               -v $$(readlink -e 
> $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
>                               -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
> diff --git a/tests/docker/run b/tests/docker/run
> index d85d49a..ed7dd31 100755
> --- a/tests/docker/run
> +++ b/tests/docker/run
> @@ -40,6 +40,17 @@ for p in dtc pixman; do
>      fi
>  done
>  
> +if test -n "$SHOW_ENV"; then
> +    if test -f /packages.txt; then
> +        echo "Packages installed:"
> +        cat /packages.txt
> +        echo
> +    fi
> +    echo "Environment variables:"
> +    env
> +    echo
> +fi
> +
>  export QEMU_SRC="$TEST_DIR/src"
>  
>  cd "$QEMU_SRC/tests/docker"

Reviewed-by: Daniel P. Berrange <address@hidden>

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|