diff mbox series

Revert "docker: Enable features explicitly in test-full"

Message ID 20171018082002.9406-1-famz@redhat.com
State New
Headers show
Series Revert "docker: Enable features explicitly in test-full" | expand

Commit Message

Fam Zheng Oct. 18, 2017, 8:20 a.m. UTC
This reverts commit 5e8a7fe673ca5949bd51939ee36faaf3b1320de8.

It's hard to get all images to have all these packages, the usual
"FEATURES" and "require" mechanism doesn't scale with so many features.
With that change, the test basically only works in ubuntu.

Until a better way comes up, leave the feature enabling to ./configure
detection.

But don't remove the "-e" removal.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/test-full | 79 +++-----------------------------------------------
 1 file changed, 4 insertions(+), 75 deletions(-)

Comments

Paolo Bonzini Nov. 15, 2017, 3:29 p.m. UTC | #1
On 18/10/2017 10:20, Fam Zheng wrote:
> This reverts commit 5e8a7fe673ca5949bd51939ee36faaf3b1320de8.
> 
> It's hard to get all images to have all these packages, the usual
> "FEATURES" and "require" mechanism doesn't scale with so many features.
> With that change, the test basically only works in ubuntu.
> 
> Until a better way comes up, leave the feature enabling to ./configure
> detection.
> 
> But don't remove the "-e" removal.
> 
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/docker/test-full | 79 +++-----------------------------------------------
>  1 file changed, 4 insertions(+), 75 deletions(-)
> 
> diff --git a/tests/docker/test-full b/tests/docker/test-full
> index 816d5a3eec..b4e42d25d7 100755
> --- a/tests/docker/test-full
> +++ b/tests/docker/test-full
> @@ -1,8 +1,8 @@
>  #!/bin/bash
>  #
> -# Compile all the targets with as many features enabled as possible
> +# Compile all the targets.
>  #
> -# Copyright 2016, 2017 Red Hat Inc.
> +# Copyright (c) 2016 Red Hat Inc.
>  #
>  # Authors:
>  #  Fam Zheng <famz@redhat.com>
> @@ -13,77 +13,6 @@
>  
>  . common.rc
>  
> -cd "$BUILD_DIR" || exit 1
> +cd "$BUILD_DIR"
>  
> -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 && install_qemu
> +build_qemu && make check $MAKEFLAGS && install_qemu
> 

Was this never committed?

Thanks,

Paolo
Fam Zheng Nov. 16, 2017, 5:26 a.m. UTC | #2
On Wed, 11/15 16:29, Paolo Bonzini wrote:
> Was this never committed?

It was forgotten by me, sorry. I'll include it in the next pull.

Fam
diff mbox series

Patch

diff --git a/tests/docker/test-full b/tests/docker/test-full
index 816d5a3eec..b4e42d25d7 100755
--- a/tests/docker/test-full
+++ b/tests/docker/test-full
@@ -1,8 +1,8 @@ 
 #!/bin/bash
 #
-# Compile all the targets with as many features enabled as possible
+# Compile all the targets.
 #
-# Copyright 2016, 2017 Red Hat Inc.
+# Copyright (c) 2016 Red Hat Inc.
 #
 # Authors:
 #  Fam Zheng <famz@redhat.com>
@@ -13,77 +13,6 @@ 
 
 . common.rc
 
-cd "$BUILD_DIR" || exit 1
+cd "$BUILD_DIR"
 
-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 && install_qemu
+build_qemu && make check $MAKEFLAGS && install_qemu