mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker testing fixes by Paolo.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJXV8dWAAoJEMo1YkxqkXHG3+4IAJHvNjIo5iE3dJYoFfes9tXc
 OgKFierRAhDvQcZqwRsR7sA1R5C3v6l3UlZZIJznFLKu1C/a69DLuB+AJgeUmpa5
 I9k1+S3QShwv3mXgGBztNmusKNMqwG3vJCv2AfZgfp5AvBOuaMGyRgHhU6H9nvk8
 NPX70GcsVWYUWw8LEc6fGZFIYWMZEAkZwP3VPLRljazLA5qtnJ+jn/Uk9YOv1/k6
 saW0nbV5ts1UQun93XJ9hnm2A4xIIE0vL7t7cn0fMlTFvoQRlPI9xBwOVxYZuyxW
 1yXDnHjKS00Kbo+6PsLYoN92T06tvG+778w2gWQxpLq0tj913jjYVjV+08JPwlI=
 =GUpp
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/famz/tags/pull-docker-20160608' into staging

Docker testing fixes by Paolo.

# gpg: Signature made Wed 08 Jun 2016 08:20:54 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/pull-docker-20160608:
  tests/docker: build all targets in test-clang
  tests/docker: support travis test with fedora image
  tests/docker: remove unused feature "ccache"
  tests/docker: fix test-mingw
  tests/docker: make test-full build all targets, not none
  tests/docker: fix make-archive-maybe

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-06-08 16:31:53 +01:00
commit d36ebffe94
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/docker/Makefile.include
View File

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

2
tests/docker/common.rc
View File

@ -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 \
"$@"

4
tests/docker/dockerfiles/fedora.docker
View File

@ -1,7 +1,7 @@
FROM fedora:23
RUN dnf install -y \
ccache git tar \
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

4
tests/docker/dockerfiles/ubuntu.docker
View File

@ -2,10 +2,10 @@ 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 \
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

2
tests/docker/test-clang
View File

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