2 files changed, 14 insertions, 2 deletions
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index 4bd23d47..77992695 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -9,6 +9,12 @@ project("acpi"
 include("CTest")
 
 #[============================================================================[
+# Global Build System Options
+#]============================================================================]
+
+option(ACPI_ENABLE_TEST_COVERAGE "Enable generation of test coverage" ON)
+
+#[============================================================================[
 # Library
 #]============================================================================]
 
@@ -85,7 +91,7 @@ if(BUILD_TESTING)
 
   set_source_files_properties("acpi/test_data/tables.S" PROPERTIES OBJECT_DEPENDS "${GENERATED_TABLE_BLOBS}")
 
-  if(COMMAND "enable_coverage" AND NOT TEACHOS_ENABLE_TEST_TSAN)
+  if(COMMAND "enable_coverage" AND ACPI_ENABLE_TEST_COVERAGE)
     enable_coverage("acpi")
   endif()
 
diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt
index 379ca7d0..d8d5ea2a 100644
--- a/libs/kstd/CMakeLists.txt
+++ b/libs/kstd/CMakeLists.txt
@@ -9,6 +9,12 @@ project("kstd"
 include("CTest")
 
 #[============================================================================[
+# Global Build System Options
+#]============================================================================]
+
+option(KSTD_ENABLE_TEST_COVERAGE "Enable generation of test coverage" ON)
+
+#[============================================================================[
 # Library
 #]============================================================================]
 
@@ -74,7 +80,7 @@ if(BUILD_TESTING)
 
     teachos_add_tests("kstd")
 
-  if(COMMAND "enable_coverage" AND NOT TEACHOS_ENABLE_TEST_TSAN)
+    if(COMMAND "enable_coverage" AND KSTD_ENABLE_TEST_COVERAGE)
         enable_coverage("kstd")
         enable_coverage("kstd_tests")
     endif()