[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/16] .travis.yml: introduce TEST_BUILD_CMD and use it for check-
From: |
Alex Bennée |
Subject: |
[PULL 12/16] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg |
Date: |
Tue, 4 Feb 2020 18:40:24 +0000 |
At least for check-tcg we can split the build phase from the test
phase and do the former in parallel. While we are at it drop the V=1
for the check-tcg part as it just generates a lot more noise in the
logs.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
diff --git a/.travis.yml b/.travis.yml
index a600f508b0a..022462f6981 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,7 @@ env:
- SRC_DIR=".."
- BUILD_DIR="build"
- BASE_CONFIG="--disable-docs --disable-tools"
+ - TEST_BUILD_CMD=""
- TEST_CMD="make check V=1"
# This is broadly a list of "mainline" softmmu targets which have support
across the major distros
-
MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
@@ -96,6 +97,12 @@ before_script:
# Main build & test - rarely overridden - controlled by TEST_CMD
script:
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
+ - |
+ if [ "$BUILD_RC" -eq 0 ] && [ -n "$TEST_BUILD_CMD" ]; then
+ ${TEST_BUILD_CMD} || BUILD_RC=$?
+ else
+ $(exit $BUILD_RC);
+ fi
- if [ "$BUILD_RC" -eq 0 ] ; then travis_retry ${TEST_CMD} ; else $(exit
$BUILD_RC); fi
after_script:
- if command -v ccache ; then ccache --show-stats ; fi
@@ -368,7 +375,8 @@ matrix:
- name: "GCC check-tcg (user)"
env:
- CONFIG="--disable-system --enable-debug-tcg"
- - TEST_CMD="make -j${JOBS} check-tcg V=1"
+ - TEST_BUILD_CMD="make -j${JOBS} build-tcg"
+ - TEST_CMD="make check-tcg"
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
@@ -377,7 +385,8 @@ matrix:
- name: "GCC plugins check-tcg (user)"
env:
- CONFIG="--disable-system --enable-plugins --enable-debug-tcg
--target-list-exclude=sparc64-linux-user"
- - TEST_CMD="make -j${JOBS} check-tcg V=1"
+ - TEST_BUILD_CMD="make -j${JOBS} build-tcg"
+ - TEST_CMD="make check-tcg"
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
@@ -385,7 +394,8 @@ matrix:
- name: "GCC check-tcg (some-softmmu)"
env:
- CONFIG="--enable-debug-tcg
--target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"
- - TEST_CMD="make -j${JOBS} check-tcg V=1"
+ - TEST_BUILD_CMD="make -j${JOBS} build-tcg"
+ - TEST_CMD="make check-tcg"
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
@@ -393,7 +403,8 @@ matrix:
- 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 -j${JOBS} check-tcg V=1"
+ - TEST_BUILD_CMD="make -j${JOBS} build-tcg"
+ - TEST_CMD="make check-tcg"
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
- name: "[aarch64] GCC check-tcg"
--
2.20.1
- [PULL 00/16] testing updates, Alex Bennée, 2020/02/04
- [PULL 04/16] .shippable: --disable-docs for cross-compile tests, Alex Bennée, 2020/02/04
- [PULL 01/16] tests/docker: move most cross compilers to buster base, Alex Bennée, 2020/02/04
- [PULL 03/16] travis.yml: Install genisoimage package, Alex Bennée, 2020/02/04
- [PULL 02/16] tests/docker: better handle symlinked libs, Alex Bennée, 2020/02/04
- [PULL 05/16] .travis.yml: Drop superfluous use of --python=python3 parameter, Alex Bennée, 2020/02/04
- [PULL 07/16] .travis.yml: build documents under bionic, Alex Bennée, 2020/02/04
- [PULL 06/16] .travis.yml: Add description to each job, Alex Bennée, 2020/02/04
- [PULL 11/16] tests/tcg: gate pauth-% tests on having compiler support, Alex Bennée, 2020/02/04
- [PULL 12/16] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg,
Alex Bennée <=
- [PULL 10/16] tests/tcg: add a configure compiler check for ARMv8.1 and SVE, Alex Bennée, 2020/02/04
- [PULL 08/16] .travis.yml: move cache flushing to early common phase, Alex Bennée, 2020/02/04
- [PULL 09/16] .travis.yml: probe for number of available processors, Alex Bennée, 2020/02/04
- [PULL 14/16] .travis.yml: drop cris-linux-user from the plugins test, Alex Bennée, 2020/02/04
- [PULL 15/16] .travis.yml: single thread build-tcg, Alex Bennée, 2020/02/04
- [PULL 13/16] .travis.yml: drop the travis_retry from tests, Alex Bennée, 2020/02/04
- [PULL 16/16] .travis.yml: ensure python3-sphinx installed for docs, Alex Bennée, 2020/02/04
- Re: [PULL 00/16] testing updates, Peter Maydell, 2020/02/06