| Message ID | 20201117173635.29101-5-alex.bennee@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | testing fixes (avocado, gitlab) | expand |
On 17/11/2020 18.36, Alex Bennée wrote: > The GCC check-tcg (user) test in particular was very prone to timing > out on Travis. We only actually need to move the some-softmmu builds > across as we already have coverage for linux-user. > > As --enable-debug-tcg does increase the run time somewhat as more > debug is put in let's restrict that to just the plugins build. It's "so" or "," -----^ ? > unlikely that a plugins enabled build is going to hide a sanity > failure in core TCG code so let the plugin builds do the heavy lifting > on checking TCG sanity so the non-plugin builds can run swiftly. > > Now the only remaining check-tcg builds on Travis are for the various > non-x86 arches. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20201110192316.26397-10-alex.bennee@linaro.org> > --- > .gitlab-ci.yml | 17 +++++++++++++++++ > .travis.yml | 26 -------------------------- > 2 files changed, 17 insertions(+), 26 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 11/17/20 2:36 PM, Alex Bennée wrote: > The GCC check-tcg (user) test in particular was very prone to timing > out on Travis. We only actually need to move the some-softmmu builds > across as we already have coverage for linux-user. > > As --enable-debug-tcg does increase the run time somewhat as more > debug is put in let's restrict that to just the plugins build. It's > unlikely that a plugins enabled build is going to hide a sanity > failure in core TCG code so let the plugin builds do the heavy lifting > on checking TCG sanity so the non-plugin builds can run swiftly. > > Now the only remaining check-tcg builds on Travis are for the various > non-x86 arches. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20201110192316.26397-10-alex.bennee@linaro.org> > --- > .gitlab-ci.yml | 17 +++++++++++++++++ > .travis.yml | 26 -------------------------- > 2 files changed, 17 insertions(+), 26 deletions(-) Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 9a8b375188..b406027a55 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -247,6 +247,15 @@ build-user: > CONFIGURE_ARGS: --disable-tools --disable-system > MAKE_CHECK_ARGS: check-tcg > > +# Only build the softmmu targets we have check-tcg tests for > +build-some-softmmu: > + <<: *native_build_job_definition > + variables: > + IMAGE: debian-all-test-cross > + CONFIGURE_ARGS: --disable-tools --enable-debug-tcg > + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu > + MAKE_CHECK_ARGS: check-tcg > + > # Run check-tcg against linux-user (with plugins) > # we skip sparc64-linux-user until it has been fixed somewhat > # we skip cris-linux-user as it doesn't use the common run loop > @@ -258,6 +267,14 @@ build-user-plugins: > MAKE_CHECK_ARGS: check-tcg > timeout: 1h 30m > > +build-some-softmmu-plugins: > + <<: *native_build_job_definition > + variables: > + IMAGE: debian-all-test-cross > + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enable-debug-tcg > + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu > + MAKE_CHECK_ARGS: check-tcg > + > build-clang: > <<: *native_build_job_definition > variables: > diff --git a/.travis.yml b/.travis.yml > index a3d78171ca..bac085f800 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -301,32 +301,6 @@ jobs: > - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; } > > > - # Run check-tcg against linux-user > - - name: "GCC check-tcg (user)" > - env: > - - CONFIG="--disable-system --enable-debug-tcg" > - - TEST_BUILD_CMD="make build-tcg" > - - TEST_CMD="make check-tcg" > - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" > - > - > - # Run check-tcg against softmmu targets > - - name: "GCC check-tcg (some-softmmu)" > - env: > - - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" > - - TEST_BUILD_CMD="make build-tcg" > - - TEST_CMD="make check-tcg" > - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" > - > - > - # Run check-tcg against softmmu targets (with plugins) > - - 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_BUILD_CMD="make build-tcg" > - - TEST_CMD="make check-tcg" > - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" > - > - name: "[aarch64] GCC check-tcg" > arch: arm64 > dist: focal
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a8b375188..b406027a55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,6 +247,15 @@ build-user: CONFIGURE_ARGS: --disable-tools --disable-system MAKE_CHECK_ARGS: check-tcg +# Only build the softmmu targets we have check-tcg tests for +build-some-softmmu: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + # Run check-tcg against linux-user (with plugins) # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop @@ -258,6 +267,14 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m +build-some-softmmu-plugins: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + build-clang: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index a3d78171ca..bac085f800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -301,32 +301,6 @@ jobs: - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; } - # Run check-tcg against linux-user - - name: "GCC check-tcg (user)" - env: - - CONFIG="--disable-system --enable-debug-tcg" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets - - name: "GCC check-tcg (some-softmmu)" - env: - - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets (with plugins) - - 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_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - name: "[aarch64] GCC check-tcg" arch: arm64 dist: focal
The GCC check-tcg (user) test in particular was very prone to timing out on Travis. We only actually need to move the some-softmmu builds across as we already have coverage for linux-user. As --enable-debug-tcg does increase the run time somewhat as more debug is put in let's restrict that to just the plugins build. It's unlikely that a plugins enabled build is going to hide a sanity failure in core TCG code so let the plugin builds do the heavy lifting on checking TCG sanity so the non-plugin builds can run swiftly. Now the only remaining check-tcg builds on Travis are for the various non-x86 arches. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20201110192316.26397-10-alex.bennee@linaro.org> --- .gitlab-ci.yml | 17 +++++++++++++++++ .travis.yml | 26 -------------------------- 2 files changed, 17 insertions(+), 26 deletions(-)