From 0adf6031855c3e77731a70706a9aa13d24351006 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Fri, 11 Mar 2022 17:40:00 +0100 Subject: [PATCH] ci: Run thread sanitizer with clang++ --- FairMQTest.cmake | 3 +++ Jenkinsfile | 2 +- test/ci/fedora.35.def | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/FairMQTest.cmake b/FairMQTest.cmake index f6e8b04e..fb9128f5 100644 --- a/FairMQTest.cmake +++ b/FairMQTest.cmake @@ -72,6 +72,9 @@ endif() if(ENABLE_SANITIZER_THREAD) list(APPEND options "-DENABLE_SANITIZER_THREAD=ON") endif() +if(CMAKE_CXX_COMPILER) + list(APPEND options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") +endif() if(CMAKE_CXX_FLAGS) list(APPEND options "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}") endif() diff --git a/Jenkinsfile b/Jenkinsfile index 35aedaea..d7e88297 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,7 +107,7 @@ pipeline{ [name: 'static-analyzers', extra: "${all_debug} -DRUN_STATIC_ANALYSIS=ON"], [name: '{address,leak,ub}-sanitizers', extra: "${all_debug} -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_LEAK=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOUR=ON -DCMAKE_CXX_FLAGS='-O1 -fno-omit-frame-pointer'"], - [name: 'thread-sanitizer', extra: "${all_debug} -DENABLE_SANITIZER_THREAD=ON"], + [name: 'thread-sanitizer', extra: "${all_debug} -DENABLE_SANITIZER_THREAD=ON -DCMAKE_CXX_COMPILER=clang++"], ]) parallel(builds + checks) diff --git a/test/ci/fedora.35.def b/test/ci/fedora.35.def index 4ffe9336..fda0d263 100644 --- a/test/ci/fedora.35.def +++ b/test/ci/fedora.35.def @@ -4,6 +4,6 @@ From: fedora:35 %post dnf -y update dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-35-x86_64/fairsoft-release-dev.rpm - dnf -y install cli11-devel pmix-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra + dnf -y install clang cli11-devel pmix-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra dnf -y builddep fairmq dnf -y clean all