aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/run
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2017-09-25 16:29:13 +0800
committerFam Zheng <famz@redhat.com>2017-09-29 11:14:14 +0800
commit299d296ea90cca388b3a1fb316c797da5b6a6708 (patch)
tree465ed6da6d3617a2c6728f075c5963a599f43ce5 /tests/docker/run
parent6283847857d8008046ceddf2db4bd908df0c063a (diff)
downloadqemu-299d296ea90cca388b3a1fb316c797da5b6a6708.zip
qemu-299d296ea90cca388b3a1fb316c797da5b6a6708.tar.gz
qemu-299d296ea90cca388b3a1fb316c797da5b6a6708.tar.bz2
docker: Fix test-mingw
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>
Diffstat (limited to 'tests/docker/run')
-rwxr-xr-xtests/docker/run3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/docker/run b/tests/docker/run
index c8f940d..0fd2f35 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