Pruning fuzz, fmt, and constexpr_test.

stlab · Aug 6, 2024 · 02ca070 · 02ca070
1 parent 262bf6f
commit 02ca070
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 159 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ add_library(adobe_contract_checking::adobe_contract_checking_warnings ALIAS adob
 add_subdirectory(configured_files)
 
 # Adding the src:
-add_subdirectory(src)
+# add_subdirectory(src)
 
 # STUFF WE WANT TO KEEP
 #
@@ -98,7 +98,6 @@ endif()
 include(CTest)
 
 if(BUILD_TESTING)
-  message(AUTHOR_WARNING "Building Tests. Be sure to check out test/constexpr_tests.cpp for constexpr testing")
   add_subdirectory(test)
 endif()
 

diff --git a/Dependencies.cmake b/Dependencies.cmake
@@ -8,21 +8,6 @@ function(adobe_contract_checking_setup_dependencies)
   # For each dependency, see if it's
   # already been provided to us by a parent project
 
-  if(NOT TARGET fmtlib::fmtlib)
-    cpmaddpackage("gh:fmtlib/fmt#9.1.0")
-  endif()
-
-  if(NOT TARGET spdlog::spdlog)
-    cpmaddpackage(
-      NAME
-      spdlog
-      VERSION
-      1.11.0
-      GITHUB_REPOSITORY
-      "gabime/spdlog"
-      OPTIONS
-      "SPDLOG_FMT_EXTERNAL ON")
-  endif()
 
   if(NOT TARGET Catch2::Catch2WithMain)
     cpmaddpackage("gh:catchorg/[email protected]")

diff --git a/ProjectOptions.cmake b/ProjectOptions.cmake
@@ -1,5 +1,4 @@
 include(cmake/SystemLink.cmake)
-include(cmake/LibFuzzer.cmake)
 include(CMakeDependentOption)
 include(CheckCXXCompilerFlag)
 
@@ -78,15 +77,6 @@ macro(adobe_contract_checking_setup_options)
       adobe_contract_checking_ENABLE_CACHE)
   endif()
 
-  adobe_contract_checking_check_libfuzzer_support(LIBFUZZER_SUPPORTED)
-  if(LIBFUZZER_SUPPORTED AND (adobe_contract_checking_ENABLE_SANITIZER_ADDRESS OR adobe_contract_checking_ENABLE_SANITIZER_THREAD OR adobe_contract_checking_ENABLE_SANITIZER_UNDEFINED))
-    set(DEFAULT_FUZZER ON)
-  else()
-    set(DEFAULT_FUZZER OFF)
-  endif()
-
-  option(adobe_contract_checking_BUILD_FUZZ_TESTS "Enable fuzz testing executable" ${DEFAULT_FUZZER})
-
 endmacro()
 
 macro(adobe_contract_checking_global_options)
@@ -99,7 +89,7 @@ macro(adobe_contract_checking_global_options)
 
   if(adobe_contract_checking_ENABLE_HARDENING AND adobe_contract_checking_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN 
+    if(NOT SUPPORTS_UBSAN
        OR adobe_contract_checking_ENABLE_SANITIZER_UNDEFINED
        OR adobe_contract_checking_ENABLE_SANITIZER_ADDRESS
        OR adobe_contract_checking_ENABLE_SANITIZER_THREAD
@@ -185,7 +175,7 @@ macro(adobe_contract_checking_local_options)
 
   if(adobe_contract_checking_ENABLE_HARDENING AND NOT adobe_contract_checking_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN 
+    if(NOT SUPPORTS_UBSAN
        OR adobe_contract_checking_ENABLE_SANITIZER_UNDEFINED
        OR adobe_contract_checking_ENABLE_SANITIZER_ADDRESS
        OR adobe_contract_checking_ENABLE_SANITIZER_THREAD

diff --git a/cmake/LibFuzzer.cmake b/cmake/LibFuzzer.cmake
diff --git a/fuzz_test/CMakeLists.txt b/fuzz_test/CMakeLists.txt
diff --git a/fuzz_test/fuzz_tester.cpp b/fuzz_test/fuzz_tester.cpp
diff --git a/gcovr.cfg b/gcovr.cfg
@@ -7,7 +7,6 @@ filter = include/*
 exclude-directories = install
 exclude-directories = out/*/*/_deps
 exclude-directories = test
-exclude-directories = fuzz_test
 
 gcov-ignore-parse-errors = yes
 print-summary = yes

diff --git a/include/myproject/sample_library.hpp b/include/myproject/sample_library.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/sample_library/CMakeLists.txt b/src/sample_library/CMakeLists.txt
diff --git a/src/sample_library/sample_library.cpp b/src/sample_library/sample_library.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -72,7 +72,6 @@ adobe_contract_checking_apply_standard_options(throwing_tests)
 target_link_libraries(
   throwing_tests
   PRIVATE
-  # adobe_contract_checking::sample_library
   adobe-contract-checking
   Catch2::Catch2WithMain)
 

diff --git a/test/constexpr_tests.cpp b/test/constexpr_tests.cpp