diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f9b0026c1f..5f88e209fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ matrix: env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=MSAN - os: linux compiler: clang-3.6 - env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=TSAN + env: CLANG_SANITIZER=TSAN - os: osx compiler: clang env: GCOV=gcov diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 5e547ed290..ba08ed1c82 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -2,12 +2,15 @@ include(CheckLibraryExists) option(USE_GCOV "Enable gcov support" OFF) +if(NOT CLANG_TSAN) +# GCOV and TSAN results in false data race reports if(USE_GCOV) message(STATUS "Enabling gcov support") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage") endif() +endif() set(GENERATED_DIR ${PROJECT_BINARY_DIR}/src/nvim/auto) set(DISPATCH_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/msgpack-gen.lua) |