From 299d296ea90cca388b3a1fb316c797da5b6a6708 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Mon, 25 Sep 2017 16:29:13 +0800 Subject: [PATCH] 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 Message-Id: <20170925082913.22089-1-famz@redhat.com> Reviewed-by: Alistair Francis Signed-off-by: Fam Zheng --- 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