Merge d1ada32 into c48864e

NeoResearch · Feb 25, 2020 · bd69195 · bd69195
2 parents c48864e + d1ada32
commit bd69195
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/spec/cpp/CMakeLists.txt b/spec/cpp/CMakeLists.txt
@@ -65,35 +65,6 @@ if (build_type STREQUAL "debug")
     add_definitions(-O0)
     add_definitions(-fstack-protector-all)
 
-    add_definitions(-fsanitize=address)
-    add_definitions(-fsanitize=alignment)
-    add_definitions(-fsanitize=bool)
-    add_definitions(-fsanitize=bounds)
-    add_definitions(-fsanitize=bounds-strict)
-    add_definitions(-fsanitize=builtin)
-    add_definitions(-fsanitize=enum)
-    add_definitions(-fsanitize=float-divide-by-zero)
-    add_definitions(-fsanitize=float-cast-overflow)
-    add_definitions(-fsanitize=integer-divide-by-zero)
-    add_definitions(-fsanitize=leak)
-#    add_definitions(-fsanitize=kernel-address)
-    add_definitions(-fsanitize=nonnull-attribute)
-    add_definitions(-fsanitize=null)
-    add_definitions(-fsanitize=object-size)
-    add_definitions(-fsanitize=pointer-compare)
-    add_definitions(-fsanitize=pointer-overflow)
-    add_definitions(-fsanitize=pointer-subtract)
-    add_definitions(-fsanitize=return)
-    add_definitions(-fsanitize=returns-nonnull-attribute)
-    add_definitions(-fsanitize=signed-integer-overflow)
-    add_definitions(-fsanitize=shift)
-    add_definitions(-fsanitize=shift-base)
-    add_definitions(-fsanitize=shift-exponent)
-#    add_definitions(-fsanitize=thread)
-    add_definitions(-fsanitize=undefined)
-    add_definitions(-fsanitize=unreachable)
-    add_definitions(-fsanitize=vla-bound)
-    add_definitions(-fsanitize=vptr)
     SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
 else ()
     message(STATUS "--- Release build ---")

diff --git a/spec/cpp/src/CMakeLists.txt b/spec/cpp/src/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(
 )
 
 if (build_type STREQUAL "debug")
-    target_link_libraries(app_test asan)
-    target_link_libraries(app_RPCtest asan)
+    # Fix asan
+#    target_link_libraries(app_test asan)
+#    target_link_libraries(app_RPCtest asan)
 endif()
diff --git a/spec/cpp/tests/CMakeLists.txt b/spec/cpp/tests/CMakeLists.txt
@@ -1,3 +1,36 @@
+if (build_type STREQUAL "debug")
+    message(STATUS "--- Debug build ---")
+    add_definitions(-fsanitize=address)
+    add_definitions(-fsanitize=alignment)
+    add_definitions(-fsanitize=bool)
+    add_definitions(-fsanitize=bounds)
+    add_definitions(-fsanitize=bounds-strict)
+    add_definitions(-fsanitize=builtin)
+    add_definitions(-fsanitize=enum)
+    add_definitions(-fsanitize=float-divide-by-zero)
+    add_definitions(-fsanitize=float-cast-overflow)
+    add_definitions(-fsanitize=integer-divide-by-zero)
+    add_definitions(-fsanitize=leak)
+    #    add_definitions(-fsanitize=kernel-address)
+    add_definitions(-fsanitize=nonnull-attribute)
+    add_definitions(-fsanitize=null)
+    add_definitions(-fsanitize=object-size)
+    add_definitions(-fsanitize=pointer-compare)
+    add_definitions(-fsanitize=pointer-overflow)
+    add_definitions(-fsanitize=pointer-subtract)
+    add_definitions(-fsanitize=return)
+    add_definitions(-fsanitize=returns-nonnull-attribute)
+    add_definitions(-fsanitize=signed-integer-overflow)
+    add_definitions(-fsanitize=shift)
+    add_definitions(-fsanitize=shift-base)
+    add_definitions(-fsanitize=shift-exponent)
+    #    add_definitions(-fsanitize=thread)
+    add_definitions(-fsanitize=undefined)
+    add_definitions(-fsanitize=unreachable)
+    add_definitions(-fsanitize=vla-bound)
+    add_definitions(-fsanitize=vptr)
+endif ()
+
 add_subdirectory(libgtest)
 
 MACRO(SUBDIRLIST result curdir)