-----BEGIN PGP SIGNATURE-----
iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlnNu1EQHGZhbXpAcmVk aGF0LmNvbQAKCRDKNWJMapFxxm3TB/0dy9Ft/7zLgVxXAoo1HSIFneBTyCxwOSSN FtZwmyN5Kxs1ptYpYAPCokshnm+z2Y9ua8eNC29TA2Dyj58M7b4yH0O2ZTAxahcm P1ZiV8G6CpDTFWuCVWK1D8a7UqmarI//ZVs/kuIcJV8mNTJMA3I/24CN1JJbokdl rafJALW188zw3MTqWQkT1SKXmQWshcQvHd8DF8VbhOTE3B7cKOS1RBg237G2nyR1 G8DXVFY7c9WgBcso8Yfh2Rj05kLIuwQocK7OpyQpFzy/aswNNla5Fgn5SMN4RE4N HCsAl6C5k+n2pe+Y4WIbsJOImRBy7oS+95wEHpsA5L2io6nqscu4 =E/ew -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/famz/tags/docker-testing-pull-request' into staging # gpg: Signature made Fri 29 Sep 2017 04:17:37 BST # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-testing-pull-request: docker: Don't mount ccache db if NOUSER=1 docker: test-block: Don't continue if build fails tests/docker/run: don't source /etc/profile docker: Fix test-mingw docker: add installation to build tests Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
be9d199751
|
|
@ -143,9 +143,11 @@ docker-run: docker-qemu-src
|
|||
-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
|
||||
-e V=$V -e J=$J -e DEBUG=$(DEBUG) \
|
||||
-e SHOW_ENV=$(SHOW_ENV) \
|
||||
-e CCACHE_DIR=/var/tmp/ccache \
|
||||
$(if $(NOUSER),, \
|
||||
-e CCACHE_DIR=/var/tmp/ccache \
|
||||
-v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
|
||||
) \
|
||||
-v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
|
||||
-v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
|
||||
$(IMAGE) \
|
||||
/var/tmp/qemu/run \
|
||||
$(TEST), " RUN $(TEST) in ${IMAGE}")
|
||||
|
|
|
|||
|
|
@ -44,3 +44,11 @@ prep_fail()
|
|||
echo "$@"
|
||||
exit 2
|
||||
}
|
||||
|
||||
install_qemu()
|
||||
{
|
||||
make install $MAKEFLAGS DESTDIR=$PWD/=destdir
|
||||
ret=$?
|
||||
rm -rf $PWD/=destdir
|
||||
return $ret
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ ENV PACKAGES \
|
|||
flex \
|
||||
g++ \
|
||||
gcc \
|
||||
gettext \
|
||||
git \
|
||||
glib2-devel \
|
||||
libepoxy-devel \
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ ENV PACKAGES \
|
|||
flex \
|
||||
g++ \
|
||||
gcc \
|
||||
gettext \
|
||||
git \
|
||||
glib2-devel \
|
||||
libepoxy-devel \
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||
clang \
|
||||
debian-ports-archive-keyring \
|
||||
flex \
|
||||
gettext \
|
||||
git \
|
||||
pkg-config \
|
||||
psmisc \
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||
clang \
|
||||
curl \
|
||||
flex \
|
||||
gettext \
|
||||
git \
|
||||
gnupg \
|
||||
pkg-config \
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||
ca-certificates \
|
||||
clang \
|
||||
flex \
|
||||
gettext \
|
||||
git \
|
||||
pkg-config \
|
||||
psmisc \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
FROM fedora:latest
|
||||
ENV PACKAGES \
|
||||
ccache git tar PyYAML sparse flex bison python2 bzip2 hostname \
|
||||
ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
|
||||
glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
|
||||
gcc gcc-c++ clang make perl which bc findutils libaio-devel \
|
||||
nettle-devel \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
FROM centos:6
|
||||
RUN yum install -y \
|
||||
tar git make gcc g++ \
|
||||
tar gettext git make gcc g++ \
|
||||
zlib-devel SDL-devel pixman-devel \
|
||||
epel-release
|
||||
RUN yum install -y libfdt-devel ccache
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ENV PACKAGES flex bison \
|
|||
libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
|
||||
libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
|
||||
texinfo \
|
||||
git make ccache python-yaml gcc clang sparse
|
||||
gettext git make ccache python-yaml gcc clang sparse
|
||||
RUN apt-get -y install $PACKAGES
|
||||
RUN dpkg -l $PACKAGES | sort > /packages.txt
|
||||
ENV FEATURES clang pyyaml
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ fi
|
|||
BASE="$(dirname $(readlink -e $0))"
|
||||
|
||||
# Prepare the environment
|
||||
. /etc/profile
|
||||
export PATH=/usr/lib/ccache:$PATH
|
||||
|
||||
if test -n "$J"; then
|
||||
|
|
@ -31,6 +30,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
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
build_qemu --target-list=x86_64-softmmu
|
||||
build_qemu --target-list=x86_64-softmmu || test_fail "Build failed"
|
||||
cd tests/qemu-iotests
|
||||
for t in raw qcow2 nbd luks; do
|
||||
./check -g quick -$t || test_fail "Test failed: iotests $t"
|
||||
|
|
|
|||
|
|
@ -18,3 +18,4 @@ cd "$BUILD_DIR"
|
|||
DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
|
||||
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
|
||||
build_qemu
|
||||
install_qemu
|
||||
|
|
|
|||
|
|
@ -24,3 +24,4 @@ OPTS="--enable-debug --cxx=clang++ --cc=clang --host-cc=clang"
|
|||
#--extra-cflags=-fno-sanitize=float-divide-by-zero"
|
||||
build_qemu $OPTS
|
||||
make $MAKEFLAGS check
|
||||
install_qemu
|
||||
|
|
|
|||
|
|
@ -86,4 +86,4 @@ build_qemu \
|
|||
--enable-xen-pci-passthrough \
|
||||
--enable-xen-pv-domain-build \
|
||||
--enable-xfsctl \
|
||||
&& make check $MAKEFLAGS
|
||||
&& make check $MAKEFLAGS && install_qemu
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
|
|||
--enable-guest-agent \
|
||||
--with-sdlabi=1.2 \
|
||||
--with-gtkabi=2.0
|
||||
install_qemu
|
||||
make clean
|
||||
|
||||
done
|
||||
|
|
|
|||
|
|
@ -19,3 +19,4 @@ DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
|
|||
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
|
||||
build_qemu
|
||||
make check $MAKEFLAGS
|
||||
install_qemu
|
||||
|
|
|
|||
Loading…
Reference in a new issue