From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmYXm-0003aW-FA for qemu-devel@nongnu.org; Tue, 20 Sep 2016 23:49:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmYXi-0000CT-Kd for qemu-devel@nongnu.org; Tue, 20 Sep 2016 23:49:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmYXi-0000CP-E6 for qemu-devel@nongnu.org; Tue, 20 Sep 2016 23:49:54 -0400 From: Fam Zheng Date: Wed, 21 Sep 2016 11:49:26 +0800 Message-Id: <1474429768-25027-8-git-send-email-famz@redhat.com> In-Reply-To: <1474429768-25027-1-git-send-email-famz@redhat.com> References: <1474429768-25027-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 7/9] docker: Support showing environment information List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng , "Daniel P. Berrange" 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 --- 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" -- 2.7.4