aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-02-11 12:27:39 +0000
committerAlex Bennée <alex.bennee@linaro.org>2021-02-15 09:38:26 +0000
commitac6d7074c0751f60ea0cbc4f0d3a3cf336033b69 (patch)
treed53bd0a08d2f796521f56a83f08a2b179f4d9383
parent3382261c26d05a3c93977f9a8d7974faf60bcd31 (diff)
travis.yml: (Re-)move the --enable-debug jobs
We already have similar jobs in the gitlab-CI ("build-some-softmmu" and "build-user-plugins"), so let's switch one of them to use --enable-debug instead of --enable-debug-tcg, then we can simply drop these jobs from the Travis-CI. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Message-Id: <20210211045455.456371-5-thuth@redhat.com> Message-Id: <20210211122750.22645-5-alex.bennee@linaro.org>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.travis.yml12
2 files changed, 1 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da2fad1249..e878cc0847 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -403,7 +403,7 @@ build-some-softmmu:
<<: *native_build_job_definition
variables:
IMAGE: debian-all-test-cross
- CONFIGURE_ARGS: --disable-tools --enable-debug-tcg
+ CONFIGURE_ARGS: --disable-tools --enable-debug
TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu
MAKE_CHECK_ARGS: check-tcg
diff --git a/.travis.yml b/.travis.yml
index 7744ec3a2f..f0e2b1059c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,18 +118,6 @@ after_script:
jobs:
include:
- # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower
- - 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
- - name: "GCC debug (user)"
- env:
- - CONFIG="--enable-debug-tcg --disable-system"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
# Using newer GCC with sanitizers