Re: [Qemu-devel] [PATCH v1 1/3] .travis.yml: collapse the test matrix

[David Gibson]

On Tue, Mar 22, 2016 at 12:53:13PM +0000, Alex Bennée wrote:
> Remove the concept of TARGETS and build the complete target list for
> each config combination. Now the matrix is just based on CONFIG stanzas
> and we use the additional stuff for:
> 
>   - things that only work on one compiler (sparse, gcov, gprof)
>   - combos where "make check" fails
> 
> Signed-off-by: Alex Bennée <address@hidden>

Reviewed-by: David Gibson <address@hidden>

> ---
>  .travis.yml | 75 
> +++++++++++++++----------------------------------------------
>  1 file changed, 18 insertions(+), 57 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 9e5873b..18c04af 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,17 +42,13 @@ notifications:
>  env:
>    global:
>      - TEST_CMD="make check"
> -    - EXTRA_CONFIG=""
>    matrix:
> -    # Group major targets together with their linux-user counterparts
> -    - 
> TARGETS=alpha-softmmu,alpha-linux-user,cris-softmmu,cris-linux-user,m68k-softmmu,m68k-linux-user,microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
> -    - 
> TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user
> -    - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
> -    - 
> TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
> -    - 
> TARGETS=or32-softmmu,or32-linux-user,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
> -    - 
> TARGETS=s390x-softmmu,s390x-linux-user,sh4-softmmu,sh4eb-softmmu,sh4-linux-user,sh4eb-linux-user,sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user,unicore32-softmmu,unicore32-linux-user
> -    # Group remaining softmmu only targets into one build
> -    - 
> TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
> +    - CONFIG=""
> +    - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log"
> +    - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr 
> --disable-brlapi --disable-uuid --disable-libusb"
> +    - CONFIG="--enable-modules"
> +    - CONFIG="--with-coroutine=ucontext"
> +    - CONFIG="--with-coroutine=sigaltstack"
>  git:
>    # we want to do this ourselves
>    submodules: false
> @@ -60,65 +56,30 @@ before_install:
>    - wget -O - 
> http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar 
> -xvJ
>    - git submodule update --init --recursive
>  before_script:
> -  - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
> +  - ./configure ${CONFIG}
>  script:
>    - make -j2 && ${TEST_CMD}
>  matrix:
> -  # We manually include a number of additional build for non-standard bits
>    include:
> -    # Debug related options
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-debug"
> +    # Sparse is GCC only
> +    - env: CONFIG="--enable-sparse"
>        compiler: gcc
> -    # We currently disable "make check"
> -    - env: TARGETS=alpha-softmmu
> -           EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"
> -           TEST_CMD=""
> -      compiler: gcc
> -    # Disable a few of the optional features
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr 
> --disable-brlapi --disable-uuid --disable-libusb"
> -      compiler: gcc
> -    # Currently configure doesn't force --disable-pie
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie"
> -      compiler: gcc
> -    # Sparse
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-sparse"
> +    # gprof/gcov are GCC features
> +    - env: CONFIG="--enable-gprof --enable-gcov --disable-pie"
>        compiler: gcc
> -    # Modules
> -    - env: TARGETS=arm-softmmu,x86_64-softmmu
> -           EXTRA_CONFIG="--enable-modules"
> -      compiler: gcc
> -    # All the trace backends (apart from dtrace)
> -    - env: TARGETS=i386-softmmu
> -           EXTRA_CONFIG="--enable-trace-backends=log"
> -      compiler: gcc
> -    # We currently disable "make check" (until 41fc57e44ed regression fixed)
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-trace-backends=simple"
> +    # We manually include builds which we disable "make check" for
> +    - env: CONFIG="--enable-debug --enable-tcg-interpreter"
>             TEST_CMD=""
>        compiler: gcc
> -    # We currently disable "make check"
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-trace-backends=ftrace"
> +    - env: CONFIG="--enable-trace-backends=simple"
>             TEST_CMD=""
>        compiler: gcc
> -    # We currently disable "make check"
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--enable-trace-backends=ust"
> +    - env: CONFIG="--enable-trace-backends=ftrace"
>             TEST_CMD=""
>        compiler: gcc
> -    # All the co-routine backends (apart from windows)
> -    # We currently disable "make check"
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--with-coroutine=gthread"
> +    - env: CONFIG="--enable-trace-backends=ust"
>             TEST_CMD=""
>        compiler: gcc
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--with-coroutine=ucontext"
> -      compiler: gcc
> -    - env: TARGETS=x86_64-softmmu
> -           EXTRA_CONFIG="--with-coroutine=sigaltstack"
> +    - env: CONFIG="--with-coroutine=gthread"
> +           TEST_CMD=""
>        compiler: gcc

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature