From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <famz@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 7/9] docker: Support showing environment information
Date: Wed, 21 Sep 2016 11:49:26 +0800 [thread overview]
Message-ID: <1474429768-25027-8-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1474429768-25027-1-git-send-email-famz@redhat.com>
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 <famz@redhat.com>
---
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
next prev parent reply other threads:[~2016-09-21 3:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 3:49 [Qemu-devel] [PATCH 0/9] docker: SHOW_ENV and terminate improvements Fam Zheng
2016-09-21 3:49 ` [Qemu-devel] [PATCH 1/9] docker: Generate /packages.txt in centos6 image Fam Zheng
2016-09-21 8:37 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 2/9] docker: Generate /packages.txt in fedora image Fam Zheng
2016-09-21 8:38 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 3/9] docker: Generate /packages.txt in ubuntu image Fam Zheng
2016-09-21 8:39 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 4/9] docker: Update fedora image to latest Fam Zheng
2016-09-21 8:39 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 5/9] docker: Flatten default target list in test-quick Fam Zheng
2016-09-21 8:40 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 6/9] docker: Print used options before doing configure Fam Zheng
2016-09-21 8:41 ` Daniel P. Berrange
2016-09-21 3:49 ` Fam Zheng [this message]
2016-09-21 8:42 ` [Qemu-devel] [PATCH 7/9] docker: Support showing environment information Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 8/9] docker: Terminate instances at SIGTERM and SIGHUP Fam Zheng
2016-09-21 8:42 ` Daniel P. Berrange
2016-09-21 3:49 ` [Qemu-devel] [PATCH 9/9] docker: exec $CMD Fam Zheng
2016-09-21 8:43 ` Daniel P. Berrange
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=1474429768-25027-8-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).