qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] docker: Fix test-mingw
@ 2017-09-25  8:29 Fam Zheng
  2017-09-26  0:04 ` Alistair Francis
  0 siblings, 1 reply; 6+ messages in thread
From: Fam Zheng @ 2017-09-25  8:29 UTC (permalink / raw)
  To: qemu-devel; +Cc: Fam Zheng, Philippe Mathieu-Daudé, Alex Bennée

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>
---
 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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] docker: fix test-mingw
@ 2019-02-04 17:04 Paolo Bonzini
  2019-02-04 17:11 ` Peter Maydell
  2019-02-04 17:13 ` no-reply
  0 siblings, 2 replies; 6+ messages in thread
From: Paolo Bonzini @ 2019-02-04 17:04 UTC (permalink / raw)
  To: qemu-devel

--with-sdlabi has been removed.  Drop it from the test-mingw docker test.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/docker/test-mingw | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index b078f22..4b84cfe 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -27,8 +27,7 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
         --enable-curl \
         --enable-vnc \
         --enable-bzip2 \
-        --enable-guest-agent \
-        --with-sdlabi=2.0
+        --enable-guest-agent
     install_qemu
     make clean
 
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-02-04 17:28 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-25  8:29 [Qemu-devel] [PATCH] docker: Fix test-mingw Fam Zheng
2017-09-26  0:04 ` Alistair Francis
  -- strict thread matches above, loose matches on Subject: below --
2019-02-04 17:04 [Qemu-devel] [PATCH] docker: fix test-mingw Paolo Bonzini
2019-02-04 17:11 ` Peter Maydell
2019-02-04 17:13 ` no-reply
2019-02-04 17:28   ` Peter Maydell

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).