From 986e19aa3d0a083e9c66d6ad878bcff8b2bc221b Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Thu, 25 Apr 2019 16:56:02 +0200
Subject: [PATCH] fix
---
.gitlab-ci.yml | 2 +-
CMakeModules/CorsikaUtilities.cmake | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06683174..0983d91b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build:
- cmake --build . -- -j4
- UBSAN_OPTIONS=print_stacktrace=1
LSAN_OPTIONS=verbosity=1:log_threads=1
- ASAN_OPTIONS=detect_leaks=1:detect_stack_use_after_return=1 ctest -V -O test.log
+ ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=1 ctest -V -O test.log
artifacts:
expire_in: 1 week
paths:
diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index 3d78907f..abd7bfcd 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -103,12 +103,9 @@ function (CORSIKA_ADD_TEST name)
file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_outputs/)
add_test (NAME ${name} COMMAND ${name} -o ${PROJECT_BINARY_DIR}/test_outputs/junit-${name}.xml -r junit)
# set(sanitize "address,implicit-integer-truncation,implicit-conversion,integer,alignment,bool,builtin,bounds,enum,float-cast-overflow,function,pointer-overflow,return,shift,shift-base,shift-exponent,unreachable,vla-bound,vptr")
- set(sanitize "address,undefined")
- ### leak sanitizer disabled for now, doesn't work on buildbot
- # if(NOT CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
- # # Apple has some security measures which interfere with the leak sanitizer, so we can't use it on OSX
- # set(sanitize "leak,${sanitize}")
- # endif()
+ # standard options not ideal, because we want to allow divide-by-zero for floats,
+ # but gcc-7 doesn't support all the detailed flags
+ set(sanitize "address,undefined")
target_compile_options(${name} PRIVATE -fno-omit-frame-pointer -fsanitize=${sanitize} -fno-sanitize-recover=all)
set_target_properties(${name} PROPERTIES LINK_FLAGS "-fsanitize=${sanitize}")
--
GitLab