On 2/5/21 6:18 AM, Thomas Huth wrote:
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 <th...@redhat.com>
---
.gitlab-ci.yml | 2 +-
.travis.yml | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
Reviewed-by: Wainer dos Santos Moschetta <waine...@redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94c22ced7b..5926ec02a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -404,7 +404,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
