Add CMake option to enable assertions irrespective CMAKE_BUILD_TYPE

atrosinenko · Sep 24, 2023 · 5d9331a · 5d9331a
1 parent 3ec8802
commit 5d9331a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,13 @@ include(runtime/common/Helpers.cmake)
 set(KBDYSCH_STANDALONE_C_COMPILER   "cc"  CACHE STRING "C compiler for non-instrumented standalone executables")
 set(KBDYSCH_STANDALONE_CXX_COMPILER "c++" CACHE STRING "C++ compiler for non-instrumented standalone executables")
 set(KBDYSCH_PERFORM_AFL_TESTS OFF CACHE BOOL "Perform tests that depend on AFL++")
+set(KBDYSCH_ENABLE_ASSERTIONS ON CACHE BOOL "Enable assertions")
+
+if (KBDYSCH_ENABLE_ASSERTIONS)
+  add_compile_options(-UNDEBUG)
+else()
+  add_compile_options(-DNDEBUG)
+endif()
 
 add_definitions(-D_GNU_SOURCE)
 

diff --git a/runtime/mutators/afl-generic-mutator.cpp b/runtime/mutators/afl-generic-mutator.cpp
@@ -1,7 +1,3 @@
-#ifdef NDEBUG
-#undef NDEBUG
-#endif
-
 #include "kbdysch/hashing.h"
 #include "kbdysch/mutator-defs.h"
 #include "kbdysch/options.h"
@@ -32,6 +28,11 @@ DECLARE_INT_KNOB_DEF(num_best_effort_iterations,
 
 using namespace kbdysch::mutator;
 
+#ifndef NDEBUG
+// Print a better message.
+#define abort() assert(0)
+#endif
+
 struct mutator_state {
   mutator_state();