diff options
author | Thomas Huth <thuth@redhat.com> | 2021-02-11 12:27:40 +0000 |
---|---|---|
committer | Alex Bennée <alex.bennee@linaro.org> | 2021-02-15 09:38:26 +0000 |
commit | 0c99f50c52c315d81071bb9255971e165e1d0a6f (patch) | |
tree | 7f234ce7f0f02e1d2208e9c1b3b4451c5e7bc583 | |
parent | ac6d7074c0751f60ea0cbc4f0d3a3cf336033b69 (diff) | |
download | qemu-0c99f50c52c315d81071bb9255971e165e1d0a6f.zip qemu-0c99f50c52c315d81071bb9255971e165e1d0a6f.tar.gz qemu-0c99f50c52c315d81071bb9255971e165e1d0a6f.tar.bz2 |
travis.yml: Move the -fsanitize=thread testing to the gitlab-CI
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 <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210211045455.456371-6-thuth@redhat.com>
Message-Id: <20210211122750.22645-6-alex.bennee@linaro.org>
-rw-r--r-- | .gitlab-ci.yml | 9 | ||||
-rw-r--r-- | .travis.yml | 51 |
2 files changed, 9 insertions, 51 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e878cc0..7adb9a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -452,6 +452,15 @@ clang-user: --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined MAKE_CHECK_ARGS: check-unit check-tcg +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 f0e2b10..0a4f38b 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 |