From 34c98c54c3c8b9e988feaa15062e40b0b11b72eb Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:52 +0200 Subject: [PATCH 1/6] tests/docker: fix make-archive-maybe make-archive-maybe expects an archive path relative to $1, but receives a path relative to the current directory. Redirect the output outside the subshell to bypass the "cd $1". Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-2-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 134dc6fff4..f88c0a7309 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -21,10 +21,10 @@ IMAGES ?= % make-archive-maybe = $(if $(wildcard $1/*), \ $(call quiet-command, \ (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \ - git archive -1 HEAD --format=tar.gz -o $2; \ + git archive -1 HEAD --format=tar.gz; \ else \ - git archive -1 $$(git stash create) --format=tar.gz -o $2; \ - fi), \ + git archive -1 $$(git stash create) --format=tar.gz; \ + fi) > $2, \ " ARCHIVE $(notdir $2)")) CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) From 53735f0b823d655f8e29e43d4ed6080970c87019 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:53 +0200 Subject: [PATCH 2/6] tests/docker: make test-full build all targets, not none Fix common.rc to avoid passing an empty --target-list= option to configure. Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-3-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/common.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index c493eebd45..77069e1285 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -24,7 +24,7 @@ requires() build_qemu() { $QEMU_SRC/configure \ - --target-list="${TARGET_LIST}" \ + ${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \ --prefix="$PWD/install" \ $EXTRA_CONFIGURE_OPTS \ "$@" From 2346b12fc52dd15421bbcc797f307d634ca1636f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:54 +0200 Subject: [PATCH 3/6] tests/docker: fix test-mingw Add flex and bison for use in test-mingw, because test-mingw uses the in-tree libdtc. Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-4-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 6251e45137..76acff36a0 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:23 RUN dnf install -y \ - ccache git tar \ + ccache git tar flex bison \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils \ mingw{32,64}-{pixman,glib2,gmp,SDL,pkg-config,gtk2,gtk3,gnutls,nettle,libtasn1,libjpeg-turbo,libpng,curl,libssh2,bzip2} diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 725a7ca5d0..44ecc12fa5 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -2,7 +2,7 @@ FROM ubuntu:14.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list RUN apt-get update -RUN apt-get -y install \ +RUN apt-get -y install flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ From 8080214dc8f8639385214eea1232411b7015eee1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:55 +0200 Subject: [PATCH 4/6] tests/docker: remove unused feature "ccache" Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-5-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/ubuntu.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 44ecc12fa5..a8b88c318c 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -8,4 +8,4 @@ RUN apt-get -y install flex bison \ libspice-protocol-dev libnss3-dev libfdt-dev \ libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ git make ccache python-yaml gcc clang sparse -ENV FEATURES clang ccache pyyaml +ENV FEATURES clang pyyaml From 78465d74c23d68959f37e101518661f30382ea77 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:56 +0200 Subject: [PATCH 5/6] tests/docker: support travis test with fedora image Install sparse and PyYAML. Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-6-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/fedora.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 76acff36a0..1d26a8e98a 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,7 +1,7 @@ FROM fedora:23 RUN dnf install -y \ - ccache git tar flex bison \ + ccache git tar PyYAML sparse flex bison \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils \ mingw{32,64}-{pixman,glib2,gmp,SDL,pkg-config,gtk2,gtk3,gnutls,nettle,libtasn1,libjpeg-turbo,libpng,curl,libssh2,bzip2} -ENV FEATURES mingw clang +ENV FEATURES mingw clang pyyaml From d3a49cbed5c18dcdce35f8e39712545ab1fd7cd0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 6 Jun 2016 16:46:57 +0200 Subject: [PATCH 6/6] tests/docker: build all targets in test-clang Warnings specific to clang may affect devices that are not build by x86_64-softmmu and aarch64-softmmu. Build all targets since that is also what Peter does. Signed-off-by: Paolo Bonzini Message-id: 1465224417-141321-7-git-send-email-pbonzini@redhat.com Signed-off-by: Fam Zheng --- tests/docker/test-clang | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/docker/test-clang b/tests/docker/test-clang index 6745dbeb83..60e4e976b3 100755 --- a/tests/docker/test-clang +++ b/tests/docker/test-clang @@ -20,7 +20,5 @@ OPTS="--enable-debug --cxx=clang++ --cc=clang --host-cc=clang" # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1263834 #OPTS="$OPTS --extra-cflags=-fsanitize=undefined \ #--extra-cflags=-fno-sanitize=float-divide-by-zero" -DEF_TARGET_LIST="$(echo {x86_64,aarch64}-softmmu)" -TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu $OPTS make $MAKEFLAGS check