Add an option ENABLE_UNITTEST_CPP_TESTS to disable the built-in (not file-based) C++ catch tests

Author: Mytherin

CMakeLists.txt

@@ -428,8 +428,9 @@ option(DEBUG_STACKTRACE "Debug setting: print a stracktrace on asserts and when
 option(DEBUG_MOVE "Debug setting: Ensure std::move is being used" FALSE)
 option(VERIFY_VECTOR "Debug setting: verify vectors (options: dictionary_expression, dictionary_operator, constant_operator, sequence_operator, nested_shuffle)" "none")
 option(CLANG_TIDY "Enable build for clang-tidy, this disables all source files excluding the core database. This does not produce a working build." FALSE)
-option(BUILD_UNITTESTS "Build the C++ Unit Tests." TRUE)
-option(UNITTEST_ROOT_DIRECTORY "The unittest root directory (defaults to the project source directory)" "${PROJECT_SOURCE_DIR}")
+option(BUILD_UNITTESTS "Build the unittest runner." TRUE)
+option(UNITTEST_ROOT_DIRECTORY "The unittest root directory (defaults to the project source directory)" FALSE)
+option(ENABLE_UNITTEST_CPP_TESTS "Build the C++ Unit Tests." TRUE)
 option(EXTENSION_CONFIG_BUILD "Produce extension configuration artifacts instead of building. (such as shared vcpkg.json, extensions.txt)" FALSE)
 option(CUSTOM_LINKER "Use a custom linker program" "")
 option(CRASH_ON_ASSERT "Trigger a sigabort on an assert failing, instead of throwing an exception" FALSE)

test/CMakeLists.txt

@@ -7,22 +7,24 @@ include_directories(include)
 include_directories("${PROJECT_BINARY_DIR}/codegen/include/")
 add_definitions(-DGENERATED_EXTENSION_HEADERS=1)
 
-add_subdirectory(api)
-add_subdirectory(appender)
-add_subdirectory(arrow)
-add_subdirectory(catalog)
-add_subdirectory(common)
+if(${ENABLE_UNITTEST_CPP_TESTS})
+  add_subdirectory(api)
+  add_subdirectory(appender)
+  add_subdirectory(arrow)
+  add_subdirectory(catalog)
+  add_subdirectory(common)
+  add_subdirectory(logging)
+  add_subdirectory(memoryleak)
+  add_subdirectory(parallel_csv)
+  add_subdirectory(secrets)
+  add_subdirectory(serialize)
+  add_subdirectory(sql)
+  add_subdirectory(ossfuzz)
+  add_subdirectory(mbedtls)
+endif()
 add_subdirectory(extension)
 add_subdirectory(helpers)
-add_subdirectory(logging)
-add_subdirectory(memoryleak)
-add_subdirectory(parallel_csv)
-add_subdirectory(secrets)
-add_subdirectory(serialize)
-add_subdirectory(sql)
 add_subdirectory(sqlite)
-add_subdirectory(ossfuzz)
-add_subdirectory(mbedtls)
 
 if(NOT WIN32 AND NOT SUN)
   if(${BUILD_TPCE})
@@ -31,7 +33,11 @@ if(NOT WIN32 AND NOT SUN)
   add_subdirectory(persistence)
 endif()
 
-add_definitions(-DDUCKDB_ROOT_DIRECTORY="${UNITTEST_ROOT_DIRECTORY}")
+if(${UNITTEST_ROOT_DIRECTORY})
+  add_definitions(-DDUCKDB_ROOT_DIRECTORY="${UNITTEST_ROOT_DIRECTORY}")
+else()
+  add_definitions(-DDUCKDB_ROOT_DIRECTORY="${PROJECT_SOURCE_DIR}")
+endif()
 
 add_executable(unittest unittest.cpp ${ALL_OBJECT_FILES})