From 19326203a149186124ec47c8b2cc2546f952aca2 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 30 Sep 2020 14:26:27 +0200 Subject: [PATCH] travis: try to fix ubsan for clang-old, take 2 --- .travis.yml | 8 ++++---- CMake/CheckDebug.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31e122ce..5d96e698 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,13 @@ addons: dist: bionic language: cpp compiler: - - gcc +# - gcc - clang env: - - BUILD=Release SASL=false - - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 MC_VERSION=1.5.22 - - BUILD=Debug SASL=false PREFIX=/opt PORT=11212 MC_VERSION=1.6.6 +# - BUILD=Release SASL=false +# - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 MC_VERSION=1.5.22 +# - BUILD=Debug SASL=false PREFIX=/opt PORT=11212 MC_VERSION=1.6.6 - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 SANITIZERS="address;undefined" #before_install: diff --git a/CMake/CheckDebug.cmake b/CMake/CheckDebug.cmake index 43368299..cd0dd9b4 100644 --- a/CMake/CheckDebug.cmake +++ b/CMake/CheckDebug.cmake @@ -50,7 +50,7 @@ function(check_debug) add_compile_definitions(HAVE_ASAN) add_compile_options(-fsanitize=address) if(CMAKE_CXX_COMPILER_ID STREQUAL Clang) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -v -fsanitize=address") endif() link_libraries(asan) check_flag(-fsanitize-recover=address IGNORE) @@ -66,7 +66,7 @@ function(check_debug) add_compile_definitions(HAVE_UBSAN) add_compile_options(-fsanitize=undefined) if(CMAKE_CXX_COMPILER_ID STREQUAL Clang) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -v -fsanitize=undefined") endif() link_libraries(ubsan) check_flag(-fsanitize-recover=undefined IGNORE) -- 2.30.2