Use clang-10, so we can also use the --enable-tsan configure
option instead of only passing the flag via --extra-cflags.
Signed-off-by: Thomas Huth
---
.gitlab-ci.yml | 9 +
.travis.yml| 51 --
2 files changed, 9 insertions(+), 51 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5926ec02a7..7a5c450dc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -453,6 +453,15 @@ clang-user:
--extra-cflags=-fno-sanitize-recover=undefined
MAKE_CHECK_ARGS: check
+tsan-build:
+ <<: *native_build_job_definition
+ variables:
+IMAGE: ubuntu2004
+CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --disable-docs
+--enable-fdt=system --enable-slirp=system
+TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user
+MAKE_CHECK_ARGS: bench V=1
+
# These targets are on the way out
build-deprecated:
<<: *native_build_job_definition
diff --git a/.travis.yml b/.travis.yml
index f0e2b1059c..0a4f38b9d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,57 +119,6 @@ after_script:
jobs:
include:
-
-# Using newer GCC with sanitizers
-- name: "GCC9 with sanitizers (softmmu)"
- dist: bionic
- addons:
-apt:
- update: true
- sources:
-# PPAs for newer toolchains
-- ubuntu-toolchain-r-test
- packages:
-# Extra toolchains
-- gcc-9
-- g++-9
-# Build dependencies
-- libaio-dev
-- libattr1-dev
-- libbrlapi-dev
-- libcap-ng-dev
-- libgnutls28-dev
-- libgtk-3-dev
-- libiscsi-dev
-- liblttng-ust-dev
-- libnfs-dev
-- libncurses5-dev
-- libnss3-dev
-- libpixman-1-dev
-- libpng-dev
-- librados-dev
-- libsdl2-dev
-- libsdl2-image-dev
-- libseccomp-dev
-- libspice-protocol-dev
-- libspice-server-dev
-- liburcu-dev
-- libusb-1.0-0-dev
-- libvte-2.91-dev
-- ninja-build
-- sparse
-- uuid-dev
- language: generic
- compiler: none
- env:
-- COMPILER_NAME=gcc CXX=g++-9 CC=gcc-9
-- CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-linux-user"
-- TEST_CMD=""
- before_script:
-- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
-- ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0
-fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }
-
-
- name: "[aarch64] GCC check-tcg"
arch: arm64
dist: focal
--
2.27.0
