| Message ID | 20200130113223.31046-9-alex.bennee@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | testing/next (with build fixes!) | expand |
On 30/01/2020 12.32, Alex Bennée wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > The NAME variable can be used to describe nicely a job (see [*]). > As we currently have 32 jobs, use it. This helps for quickly > finding a particular job. > > before: https://travis-ci.org/qemu/qemu/builds/639887646 > after: https://travis-ci.org/philmd/qemu/builds/641795043 > > [*] https://docs.travis-ci.com/user/customizing-the-build/#naming-jobs-within-matrices > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Message-Id: <20200125183135.28317-1-f4bug@amsat.org> > > --- > [ajb] > - drop [x86] > --- > .travis.yml | 101 ++++++++++++++++++++++++++++++++++------------------ > 1 file changed, 67 insertions(+), 34 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 7526967847..056db1adac 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -96,24 +96,28 @@ after_script: > > matrix: > include: > - - env: > + - name: "GCC static (user)" > + env: > - CONFIG="--disable-system --static" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > > > # we split the system builds as it takes a while to build them all > - - env: > + - name: "GCC (main-softmmu)" > + env: > - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > > > - - env: > - - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" > + - name: "GCC (other-softmmu)" > + env: > + - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > > > # Just build tools and run minimal unit and softfloat checks > - - env: > + - name: "GCC check-softfloat (user)" > + env: > - BASE_CONFIG="--enable-tools" > - CONFIG="--disable-user --disable-system" > - TEST_CMD="make check-unit check-softfloat -j3" > @@ -121,41 +125,48 @@ matrix: > > > # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower > - - env: > + - name: "GCC debug (main-softmmu)" > + env: > - CONFIG="--enable-debug --target-list=${MAIN_SOFTMMU_TARGETS}" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" > > > # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions > - - env: > + - name: "GCC debug (user)" > + env: > - CONFIG="--enable-debug-tcg --disable-system" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" > > > - - env: > + - name: "GCC some libs disabled (main-softmmu)" > + env: > - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-replication --target-list=${MAIN_SOFTMMU_TARGETS}" > > > # Module builds are mostly of interest to major distros > - - env: > + - name: "GCC modules (main-softmmu)" > + env: > - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > > > # Alternate coroutines implementations are only really of interest to KVM users > # However we can't test against KVM on Travis so we can only run unit tests > - - env: > + - name: "check-unit coroutine=ucontext" > + env: > - CONFIG="--with-coroutine=ucontext --disable-tcg" > - TEST_CMD="make check-unit -j3 V=1" > > > - - env: > + - name: "check-unit coroutine=sigaltstack" > + env: > - CONFIG="--with-coroutine=sigaltstack --disable-tcg" > - TEST_CMD="make check-unit -j3 V=1" > > > # Check we can build docs and tools (out of tree) > - - env: > + - name: "[x86] tools and docs" Could you please also drop this "[x86]" here? Thanks, Thomas
On 1/30/20 8:06 PM, Thomas Huth wrote: > On 30/01/2020 12.32, Alex Bennée wrote: >> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >> >> The NAME variable can be used to describe nicely a job (see [*]). >> As we currently have 32 jobs, use it. This helps for quickly >> finding a particular job. >> >> before: https://travis-ci.org/qemu/qemu/builds/639887646 >> after: https://travis-ci.org/philmd/qemu/builds/641795043 >> >> [*] https://docs.travis-ci.com/user/customizing-the-build/#naming-jobs-within-matrices >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Message-Id: <20200125183135.28317-1-f4bug@amsat.org> >> >> --- >> [ajb] >> - drop [x86] >> --- >> .travis.yml | 101 ++++++++++++++++++++++++++++++++++------------------ >> 1 file changed, 67 insertions(+), 34 deletions(-) >> >> diff --git a/.travis.yml b/.travis.yml >> index 7526967847..056db1adac 100644 >> --- a/.travis.yml >> +++ b/.travis.yml >> @@ -96,24 +96,28 @@ after_script: >> >> matrix: >> include: >> - - env: >> + - name: "GCC static (user)" >> + env: >> - CONFIG="--disable-system --static" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >> >> >> # we split the system builds as it takes a while to build them all >> - - env: >> + - name: "GCC (main-softmmu)" >> + env: >> - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >> >> >> - - env: >> - - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" >> + - name: "GCC (other-softmmu)" >> + env: >> + - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >> >> >> # Just build tools and run minimal unit and softfloat checks >> - - env: >> + - name: "GCC check-softfloat (user)" >> + env: >> - BASE_CONFIG="--enable-tools" >> - CONFIG="--disable-user --disable-system" >> - TEST_CMD="make check-unit check-softfloat -j3" >> @@ -121,41 +125,48 @@ matrix: >> >> >> # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower >> - - env: >> + - name: "GCC debug (main-softmmu)" >> + env: >> - CONFIG="--enable-debug --target-list=${MAIN_SOFTMMU_TARGETS}" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" >> >> >> # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions >> - - env: >> + - name: "GCC debug (user)" >> + env: >> - CONFIG="--enable-debug-tcg --disable-system" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" >> >> >> - - env: >> + - name: "GCC some libs disabled (main-softmmu)" >> + env: >> - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-replication --target-list=${MAIN_SOFTMMU_TARGETS}" >> >> >> # Module builds are mostly of interest to major distros >> - - env: >> + - name: "GCC modules (main-softmmu)" >> + env: >> - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" >> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >> >> >> # Alternate coroutines implementations are only really of interest to KVM users >> # However we can't test against KVM on Travis so we can only run unit tests >> - - env: >> + - name: "check-unit coroutine=ucontext" >> + env: >> - CONFIG="--with-coroutine=ucontext --disable-tcg" >> - TEST_CMD="make check-unit -j3 V=1" >> >> >> - - env: >> + - name: "check-unit coroutine=sigaltstack" >> + env: >> - CONFIG="--with-coroutine=sigaltstack --disable-tcg" >> - TEST_CMD="make check-unit -j3 V=1" >> >> >> # Check we can build docs and tools (out of tree) >> - - env: >> + - name: "[x86] tools and docs" > > Could you please also drop this "[x86]" here? The hunk got applied into the next patch: # Check we can build docs and tools (out of tree) - - name: "[x86] tools and docs" + - name: "tools and docs (bionic)" + dist: bionic env: - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." - BASE_CONFIG="--enable-tools --enable-docs"
On 31/01/2020 16.24, Philippe Mathieu-Daudé wrote: > On 1/30/20 8:06 PM, Thomas Huth wrote: >> On 30/01/2020 12.32, Alex Bennée wrote: >>> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> >>> The NAME variable can be used to describe nicely a job (see [*]). >>> As we currently have 32 jobs, use it. This helps for quickly >>> finding a particular job. >>> >>> before: https://travis-ci.org/qemu/qemu/builds/639887646 >>> after: https://travis-ci.org/philmd/qemu/builds/641795043 >>> >>> [*] >>> https://docs.travis-ci.com/user/customizing-the-build/#naming-jobs-within-matrices >>> >>> >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> Message-Id: <20200125183135.28317-1-f4bug@amsat.org> >>> >>> --- >>> [ajb] >>> - drop [x86] >>> --- >>> .travis.yml | 101 ++++++++++++++++++++++++++++++++++------------------ >>> 1 file changed, 67 insertions(+), 34 deletions(-) >>> >>> diff --git a/.travis.yml b/.travis.yml >>> index 7526967847..056db1adac 100644 >>> --- a/.travis.yml >>> +++ b/.travis.yml >>> @@ -96,24 +96,28 @@ after_script: >>> matrix: >>> include: >>> - - env: >>> + - name: "GCC static (user)" >>> + env: >>> - CONFIG="--disable-system --static" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >>> # we split the system builds as it takes a while to build >>> them all >>> - - env: >>> + - name: "GCC (main-softmmu)" >>> + env: >>> - CONFIG="--disable-user >>> --target-list=${MAIN_SOFTMMU_TARGETS}" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >>> - - env: >>> - - CONFIG="--disable-user >>> --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" >>> + - name: "GCC (other-softmmu)" >>> + env: >>> + - CONFIG="--disable-user >>> --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >>> # Just build tools and run minimal unit and softfloat checks >>> - - env: >>> + - name: "GCC check-softfloat (user)" >>> + env: >>> - BASE_CONFIG="--enable-tools" >>> - CONFIG="--disable-user --disable-system" >>> - TEST_CMD="make check-unit check-softfloat -j3" >>> @@ -121,41 +125,48 @@ matrix: >>> # --enable-debug implies --enable-debug-tcg, also runs >>> quite a bit slower >>> - - env: >>> + - name: "GCC debug (main-softmmu)" >>> + env: >>> - CONFIG="--enable-debug >>> --target-list=${MAIN_SOFTMMU_TARGETS}" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" >>> # TCG debug can be run just on its own and is mostly >>> agnostic to user/softmmu distinctions >>> - - env: >>> + - name: "GCC debug (user)" >>> + env: >>> - CONFIG="--enable-debug-tcg --disable-system" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" >>> - - env: >>> + - name: "GCC some libs disabled (main-softmmu)" >>> + env: >>> - CONFIG="--disable-linux-aio --disable-cap-ng >>> --disable-attr --disable-brlapi --disable-libusb >>> --disable-replication --target-list=${MAIN_SOFTMMU_TARGETS}" >>> # Module builds are mostly of interest to major distros >>> - - env: >>> + - name: "GCC modules (main-softmmu)" >>> + env: >>> - CONFIG="--enable-modules >>> --target-list=${MAIN_SOFTMMU_TARGETS}" >>> - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" >>> # Alternate coroutines implementations are only really of >>> interest to KVM users >>> # However we can't test against KVM on Travis so we can only >>> run unit tests >>> - - env: >>> + - name: "check-unit coroutine=ucontext" >>> + env: >>> - CONFIG="--with-coroutine=ucontext --disable-tcg" >>> - TEST_CMD="make check-unit -j3 V=1" >>> - - env: >>> + - name: "check-unit coroutine=sigaltstack" >>> + env: >>> - CONFIG="--with-coroutine=sigaltstack --disable-tcg" >>> - TEST_CMD="make check-unit -j3 V=1" >>> # Check we can build docs and tools (out of tree) >>> - - env: >>> + - name: "[x86] tools and docs" >> >> Could you please also drop this "[x86]" here? > > The hunk got applied into the next patch: > > # Check we can build docs and tools (out of tree) > - - name: "[x86] tools and docs" > + - name: "tools and docs (bionic)" > + dist: bionic Ok, fine for me, too. Thomas
diff --git a/.travis.yml b/.travis.yml index 7526967847..056db1adac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,24 +96,28 @@ after_script: matrix: include: - - env: + - name: "GCC static (user)" + env: - CONFIG="--disable-system --static" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # we split the system builds as it takes a while to build them all - - env: + - name: "GCC (main-softmmu)" + env: - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - - env: - - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" + - name: "GCC (other-softmmu)" + env: + - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # Just build tools and run minimal unit and softfloat checks - - env: + - name: "GCC check-softfloat (user)" + env: - BASE_CONFIG="--enable-tools" - CONFIG="--disable-user --disable-system" - TEST_CMD="make check-unit check-softfloat -j3" @@ -121,41 +125,48 @@ matrix: # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower - - env: + - name: "GCC debug (main-softmmu)" + env: - CONFIG="--enable-debug --target-list=${MAIN_SOFTMMU_TARGETS}" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions - - env: + - name: "GCC debug (user)" + env: - CONFIG="--enable-debug-tcg --disable-system" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - env: + - name: "GCC some libs disabled (main-softmmu)" + env: - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-replication --target-list=${MAIN_SOFTMMU_TARGETS}" # Module builds are mostly of interest to major distros - - env: + - name: "GCC modules (main-softmmu)" + env: - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # Alternate coroutines implementations are only really of interest to KVM users # However we can't test against KVM on Travis so we can only run unit tests - - env: + - name: "check-unit coroutine=ucontext" + env: - CONFIG="--with-coroutine=ucontext --disable-tcg" - TEST_CMD="make check-unit -j3 V=1" - - env: + - name: "check-unit coroutine=sigaltstack" + env: - CONFIG="--with-coroutine=sigaltstack --disable-tcg" - TEST_CMD="make check-unit -j3 V=1" # Check we can build docs and tools (out of tree) - - env: + - name: "[x86] tools and docs" + env: - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." - BASE_CONFIG="--enable-tools --enable-docs" - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" @@ -169,13 +180,15 @@ matrix: # Test with Clang for compile portability (Travis uses clang-5.0) - - env: + - name: "Clang (user)" + env: - CONFIG="--disable-system" - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default" compiler: clang - - env: + - name: "Clang (main-softmmu)" + env: - CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS} " - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-sanitize" compiler: clang @@ -184,52 +197,60 @@ matrix: - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log && exit 1; } - - env: + - name: "Clang (other-softmmu)" + env: - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default" compiler: clang # gprof/gcov are GCC features - - env: + - name: "GCC gprof/gcov" + env: - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=${MAIN_SOFTMMU_TARGETS}" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh # We manually include builds which we disable "make check" for - - env: + - name: "GCC without-default-devices (softmmu)" + env: - CONFIG="--without-default-devices --disable-user" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - TEST_CMD="" # Check the TCG interpreter (TCI) - - env: + - name: "GCC TCI" + env: - CONFIG="--enable-debug-tcg --enable-tcg-interpreter --disable-kvm --disable-containers --target-list=alpha-softmmu,arm-softmmu,hppa-softmmu,m68k-softmmu,microblaze-softmmu,moxie-softmmu,ppc-softmmu,s390x-softmmu,x86_64-softmmu" - TEST_CMD="make check-qtest check-tcg V=1" # We don't need to exercise every backend with every front-end - - env: + - name: "GCC trace log,simple,syslog (user)" + env: - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" - TEST_CMD="" - - env: + - name: "GCC trace ftrace (x86_64-softmmu)" + env: - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" - TEST_CMD="" - - env: + - name: "GCC trace ust (x86_64-softmmu)" + env: - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" - TEST_CMD="" # MacOSX builds - cirrus.yml also tests some MacOS builds including latest Xcode - - env: + - name: "OSX Xcode 10.3" + env: - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10.3 @@ -252,7 +273,8 @@ matrix: # Python builds - - env: + - name: "GCC Python 3.5 (x86_64-softmmu)" + env: - CONFIG="--target-list=x86_64-softmmu" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python @@ -260,7 +282,8 @@ matrix: - "3.5" - - env: + - name: "GCC Python 3.6 (x86_64-softmmu)" + env: - CONFIG="--target-list=x86_64-softmmu" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python @@ -269,7 +292,8 @@ matrix: # Acceptance (Functional) tests - - env: + - name: "GCC check-acceptance" + env: - CONFIG="--target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" - TEST_CMD="make check-acceptance" after_script: @@ -285,7 +309,8 @@ matrix: # Using newer GCC with sanitizers - - addons: + - name: "GCC9 with sanitizers (softmmu)" + addons: apt: update: true sources: @@ -333,7 +358,8 @@ matrix: # Run check-tcg against linux-user - - env: + - name: "GCC check-tcg (user)" + env: - CONFIG="--disable-system --enable-debug-tcg" - TEST_CMD="make -j3 check-tcg V=1" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" @@ -341,26 +367,30 @@ matrix: # Run check-tcg against linux-user (with plugins) # we skip sparc64-linux-user until it has been fixed somewhat - - env: + - name: "GCC plugins check-tcg (user)" + env: - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user" - TEST_CMD="make -j3 check-tcg V=1" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" # Run check-tcg against softmmu targets - - env: + - name: "GCC check-tcg (some-softmmu)" + env: - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - TEST_CMD="make -j3 check-tcg V=1" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" # Run check-tcg against softmmu targets (with plugins) - - env: + - name: "GCC plugins check-tcg (some-softmmu)" + env: - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - TEST_CMD="make -j3 check-tcg V=1" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - arch: arm64 + - name: "[aarch64] GCC check-tcg" + arch: arm64 dist: xenial addons: apt_packages: @@ -391,7 +421,8 @@ matrix: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}" - - arch: ppc64le + - name: "[ppc64] GCC check-tcg" + arch: ppc64le dist: xenial addons: apt_packages: @@ -422,7 +453,8 @@ matrix: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},ppc64le-linux-user" - - arch: s390x + - name: "[s390x] GCC check-tcg" + arch: s390x dist: bionic addons: apt_packages: @@ -456,7 +488,8 @@ matrix: # Release builds # The make-release script expect a QEMU version, so our tag must start with a 'v'. # This is the case when release candidate tags are created. - - if: tag IS present AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/ + - name: "Release tarball" + if: tag IS present AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/ env: # We want to build from the release tarball - BUILD_DIR="release/build/dir" SRC_DIR="../../.."