aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/acpi/CMakeLists.txt4
-rw-r--r--libs/kstd/CMakeLists.txt4
-rw-r--r--libs/kstd/kstd/flat_map.tests.cpp1
3 files changed, 8 insertions, 1 deletions
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index 77992695..32ce8a05 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -64,6 +64,10 @@ if(BUILD_TESTING)
include("Catch")
include("BuildHostTests")
+ if(TEACHOS_ENABLE_TEST_TSAN)
+ return()
+ endif()
+
find_program(IASL_EXE NAMES "iasl" REQUIRED)
set(TEST_TABLES
diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt
index d8d5ea2a..ada786a4 100644
--- a/libs/kstd/CMakeLists.txt
+++ b/libs/kstd/CMakeLists.txt
@@ -78,6 +78,10 @@ if(BUILD_TESTING)
include("Catch")
include("BuildHostTests")
+ if(TEACHOS_ENABLE_TEST_TSAN)
+ return()
+ endif()
+
teachos_add_tests("kstd")
if(COMMAND "enable_coverage" AND KSTD_ENABLE_TEST_COVERAGE)
diff --git a/libs/kstd/kstd/flat_map.tests.cpp b/libs/kstd/kstd/flat_map.tests.cpp
index 42c60de5..16b97678 100644
--- a/libs/kstd/kstd/flat_map.tests.cpp
+++ b/libs/kstd/kstd/flat_map.tests.cpp
@@ -6,7 +6,6 @@
#include <catch2/catch_test_macros.hpp>
-#include <algorithm>
#include <functional>
#include <type_traits>