On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
> We will keep adding/removing options to our 'configure' script,
> so for easier maintainability it makes sense to have CONFIGURE_ARGS
> declared as one option per line. This way we can review diff easily
> (or rebase/cherry-pick).
>
> No logical change.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Daniel P . Berrange <berrange@redhat.com>
> ---
> .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 63 insertions(+), 17 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3b15ae5c302..9f090cca5e3 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -203,23 +203,69 @@ build-disabled:
> <<: *native_build_job_definition
> variables:
> IMAGE: fedora
> - CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs
> - --disable-brlapi --disable-bzip2 --disable-cap-ng --disable-capstone
> - --disable-cloop --disable-coroutine-pool --disable-curl --disable-curses
> - --disable-dmg --disable-docs --disable-glusterfs --disable-gnutls
> - --disable-gtk --disable-guest-agent --disable-iconv --disable-kvm
> - --disable-libiscsi --disable-libpmem --disable-libssh --disable-libusb
> - --disable-libxml2 --disable-linux-aio --disable-live-block-migration
> - --disable-lzo --disable-malloc-trim --disable-mpath --disable-nettle
> - --disable-numa --disable-parallels --disable-pie --disable-qcow1
> - --disable-qed --disable-qom-cast-debug --disable-rbd --disable-rdma
> - --disable-replication --disable-sdl --disable-seccomp --disable-sheepdog
> - --disable-slirp --disable-smartcard --disable-snappy --disable-spice
> - --disable-strip --disable-tpm --disable-usb-redir --disable-vdi
> - --disable-vhost-crypto --disable-vhost-net --disable-vhost-scsi
> - --disable-vhost-user --disable-vhost-vdpa --disable-vhost-vsock
> - --disable-virglrenderer --disable-vnc --disable-vte --disable-vvfat
> - --disable-xen --disable-zstd
> + CONFIGURE_ARGS:
I suggest to use '>-' like 'CONFIGURE_ARGS: >-'. It's up to you.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> + --disable-attr
> + --disable-avx2
> + --disable-bochs
> + --disable-brlapi
> + --disable-bzip2
> + --disable-cap-ng
> + --disable-capstone
> + --disable-cloop
> + --disable-coroutine-pool
> + --disable-curl
> + --disable-curses
> + --disable-dmg
> + --disable-docs
> + --disable-glusterfs
> + --disable-gnutls
> + --disable-gtk
> + --disable-guest-agent
> + --disable-iconv
> + --disable-kvm
> + --disable-libiscsi
> + --disable-libpmem
> + --disable-libssh
> + --disable-libusb
> + --disable-libxml2
> + --disable-linux-aio
> + --disable-live-block-migration
> + --disable-lzo
> + --disable-malloc-trim
> + --disable-mpath
> + --disable-nettle
> + --disable-numa
> + --disable-parallels
> + --disable-pie
> + --disable-qcow1
> + --disable-qed
> + --disable-qom-cast-debug
> + --disable-rbd
> + --disable-rdma
> + --disable-replication
> + --disable-sdl
> + --disable-seccomp
> + --disable-sheepdog
> + --disable-slirp
> + --disable-smartcard
> + --disable-snappy
> + --disable-spice
> + --disable-strip
> + --disable-tpm
> + --disable-usb-redir
> + --disable-vdi
> + --disable-vhost-crypto
> + --disable-vhost-net
> + --disable-vhost-scsi
> + --disable-vhost-user
> + --disable-vhost-vdpa
> + --disable-vhost-vsock
> + --disable-virglrenderer
> + --disable-vnc
> + --disable-vte
> + --disable-vvfat
> + --disable-xen
> + --disable-zstd
> TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu
> s390x-softmmu i386-linux-user
> MAKE_CHECK_ARGS: check-qtest SPEED=slow