From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [Qemu-devel] [PULL 2/5] docker: Fix test-mingw
Date: Fri, 29 Sep 2017 11:18:28 +0800 [thread overview]
Message-ID: <20170929031831.10179-3-famz@redhat.com> (raw)
In-Reply-To: <20170929031831.10179-1-famz@redhat.com>
Feature "dtc" is explicitly required by test-mingw, but is not detected
by the run script since we switched to archive-source.sh in b7f404201e4.
Since it isn't available in the Fedora image which runs this test on
patchew, the way we get dtc is still from submodule.
archive-source.sh takes care of bundling the submodule files already, so
what we need to do is just checking if files are there. Makefile is
chosen because it is one that is unlikely to get renamed in the future.
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170925082913.22089-1-famz@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/run | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/docker/run b/tests/docker/run
index c8f940de15..0fd2f358ce 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -31,6 +31,9 @@ mkdir -p $TEST_DIR/{src,build,install}
# Extract the source tarballs
tar -C $TEST_DIR/src -xf $BASE/qemu.tar || prep_fail "Failed to untar source"
+if test -f $TEST_DIR/src/Makefile; then
+ export FEATURES="$FEATURES dtc"
+fi
if test -n "$SHOW_ENV"; then
if test -f /packages.txt; then
--
2.13.5
next prev parent reply other threads:[~2017-09-29 3:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-29 3:18 [Qemu-devel] [PULL 0/5] Docker testing patches Fam Zheng
2017-09-29 3:18 ` [Qemu-devel] [PULL 1/5] docker: add installation to build tests Fam Zheng
2017-09-29 3:18 ` Fam Zheng [this message]
2017-09-29 3:18 ` [Qemu-devel] [PULL 3/5] tests/docker/run: don't source /etc/profile Fam Zheng
2017-09-29 3:18 ` [Qemu-devel] [PULL 4/5] docker: test-block: Don't continue if build fails Fam Zheng
2017-09-29 3:18 ` [Qemu-devel] [PULL 5/5] docker: Don't mount ccache db if NOUSER=1 Fam Zheng
2017-10-03 12:49 ` [Qemu-devel] [PULL 0/5] Docker testing patches Peter Maydell
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=20170929031831.10179-3-famz@redhat.com \
--to=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--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).