[Qemu-devel] [PATCH 0/2] docker: Update ubuntu and test-full for more coverage

[Qemu-devel] [PATCH 0/2] docker: Update ubuntu and test-full for more coverage

[Fam Zheng]

Fam Zheng (2):
  docker: Update ubuntu image
  docker: Enable features explicitly in test-full

 tests/docker/dockerfiles/ubuntu.docker | 11 +++--
 tests/docker/test-full                 | 80 +++++++++++++++++++++++++++++++---
 2 files changed, 83 insertions(+), 8 deletions(-)

-- 
2.13.5

[Qemu-devel] [PATCH 1/2] docker: Update ubuntu image

[Fam Zheng]

Base on the newer ubuntu-lts (16.06) and include more packages for
better build coverage.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/dockerfiles/ubuntu.docker | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index a360a050a2..d73ce02246 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -1,12 +1,17 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
     /etc/apt/sources.list
 RUN apt-get update
 ENV PACKAGES flex bison \
-    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev \
+    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-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 \
+    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
+    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
+    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
+    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
 RUN apt-get -y install $PACKAGES
 RUN dpkg -l $PACKAGES | sort > /packages.txt
-- 
2.13.5

[Qemu-devel] [PATCH 2/2] docker: Enable features explicitly in test-full

[Fam Zheng]

Also avoid "set -e".

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/test-full | 80 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 5 deletions(-)

diff --git a/tests/docker/test-full b/tests/docker/test-full
index 05f0d491d1..bd095ad91b 100755
--- a/tests/docker/test-full
+++ b/tests/docker/test-full
@@ -1,8 +1,8 @@
-#!/bin/bash -e
+#!/bin/bash
 #
-# Compile all the targets.
+# Compile all the targets with as many features enabled as possible
 #
-# Copyright (c) 2016 Red Hat Inc.
+# Copyright 2016, 2017 Red Hat Inc.
 #
 # Authors:
 #  Fam Zheng <famz@redhat.com>
@@ -15,5 +15,75 @@
 
 cd "$BUILD_DIR"
 
-build_qemu
-make check $MAKEFLAGS
+build_qemu \
+    --enable-attr \
+    --enable-bluez \
+    --enable-brlapi \
+    --enable-bsd-user \
+    --enable-bzip2 \
+    --enable-cap-ng \
+    --enable-coroutine-pool \
+    --enable-crypto-afalg \
+    --enable-curl \
+    --enable-curses \
+    --enable-debug \
+    --enable-debug-info \
+    --enable-debug-tcg \
+    --enable-docs \
+    --enable-fdt \
+    --enable-gcrypt \
+    --enable-glusterfs \
+    --enable-gnutls \
+    --enable-gprof \
+    --enable-gtk \
+    --enable-guest-agent \
+    --enable-jemalloc \
+    --enable-kvm \
+    --enable-libiscsi \
+    --enable-libnfs \
+    --enable-libssh2 \
+    --enable-libusb \
+    --enable-linux-aio \
+    --enable-linux-user \
+    --enable-live-block-migration \
+    --enable-lzo \
+    --enable-modules \
+    --enable-numa \
+    --enable-opengl \
+    --enable-pie \
+    --enable-profiler \
+    --enable-qom-cast-debug \
+    --enable-rbd \
+    --enable-rdma \
+    --enable-replication \
+    --enable-sdl \
+    --enable-seccomp \
+    --enable-smartcard \
+    --enable-snappy \
+    --enable-spice \
+    --enable-stack-protector \
+    --enable-system \
+    --enable-tcg \
+    --enable-tcg-interpreter \
+    --enable-tools \
+    --enable-tpm \
+    --enable-trace-backend=ftrace \
+    --enable-usb-redir \
+    --enable-user \
+    --enable-vde \
+    --enable-vhost-net \
+    --enable-vhost-scsi \
+    --enable-vhost-user \
+    --enable-vhost-vsock \
+    --enable-virtfs \
+    --enable-vnc \
+    --enable-vnc-jpeg \
+    --enable-vnc-png \
+    --enable-vnc-sasl \
+    --enable-vte \
+    --enable-werror \
+    --enable-xen \
+    --enable-xen-pci-passthrough \
+    --enable-xen-pv-domain-build \
+    --enable-xfsctl \
+&& make check $MAKEFLAGS
-- 
2.13.5

Re: [Qemu-devel] [PATCH 2/2] docker: Enable features explicitly in test-full

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

On 09/07/2017 03:11 AM, Fam Zheng wrote:
> Also avoid "set -e".
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/docker/test-full | 80 ++++++++++++++++++++++++++++++++++++++++++++++----
>  1 file changed, 75 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/docker/test-full b/tests/docker/test-full
> index 05f0d491d1..bd095ad91b 100755
> --- a/tests/docker/test-full
> +++ b/tests/docker/test-full
> @@ -1,8 +1,8 @@
> -#!/bin/bash -e
> +#!/bin/bash

When you drop 'set -e'...

>  #
> -# Compile all the targets.
> +# Compile all the targets with as many features enabled as possible
>  #
> -# Copyright (c) 2016 Red Hat Inc.
> +# Copyright 2016, 2017 Red Hat Inc.
>  #
>  # Authors:
>  #  Fam Zheng <famz@redhat.com>
> @@ -15,5 +15,75 @@
>  
>  cd "$BUILD_DIR"

...then you should explicitly check for failure after commands where you
really do not want to continue execution if they failed.  I'd write this:

cd "$BUILD_DIR" || exit 1

or else use && to chain it to...

>  
> -build_qemu
> -make check $MAKEFLAGS
> +build_qemu \
> +    --enable-attr \

> +    --enable-xfsctl \
> +&& make check $MAKEFLAGS

the rest of your chain.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

Re: [Qemu-devel] [PATCH 2/2] docker: Enable features explicitly in test-full

[Fam Zheng]

On Thu, 09/07 08:37, Eric Blake wrote:
> On 09/07/2017 03:11 AM, Fam Zheng wrote:
> > Also avoid "set -e".
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  tests/docker/test-full | 80 ++++++++++++++++++++++++++++++++++++++++++++++----
> >  1 file changed, 75 insertions(+), 5 deletions(-)
> > 
> > diff --git a/tests/docker/test-full b/tests/docker/test-full
> > index 05f0d491d1..bd095ad91b 100755
> > --- a/tests/docker/test-full
> > +++ b/tests/docker/test-full
> > @@ -1,8 +1,8 @@
> > -#!/bin/bash -e
> > +#!/bin/bash
> 
> When you drop 'set -e'...
> 
> >  #
> > -# Compile all the targets.
> > +# Compile all the targets with as many features enabled as possible
> >  #
> > -# Copyright (c) 2016 Red Hat Inc.
> > +# Copyright 2016, 2017 Red Hat Inc.
> >  #
> >  # Authors:
> >  #  Fam Zheng <famz@redhat.com>
> > @@ -15,5 +15,75 @@
> >  
> >  cd "$BUILD_DIR"
> 
> ...then you should explicitly check for failure after commands where you
> really do not want to continue execution if they failed.  I'd write this:

We can probably tolerate the failure of cd, but it might be better if we are
strict on that. Will update.

Fam