14 files changed, 16 insertions, 39 deletions
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index 58661c5e..caffa1c9 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -56,6 +56,7 @@ set_target_properties("acpi" PROPERTIES
 if(BUILD_TESTING)
   find_package("Catch2")
   include("Catch")
+  include("BuildHostTests")
 
   find_program(IASL_EXE NAMES "iasl" REQUIRED)
 
@@ -88,37 +89,13 @@ if(BUILD_TESTING)
     enable_coverage("acpi")
   endif()
 
-  add_executable("acpi_tests")
-  add_executable("acpi::tests" ALIAS "acpi_tests")
+  teachos_add_tests("acpi")
 
   target_sources("acpi_tests" PRIVATE
-    "acpi/common/table_header.test.cpp"
-    "acpi/data/madt.test.cpp"
-    "acpi/data/rsdt.test.cpp"
-    "acpi/data/xsdt.test.cpp"
-    "acpi/pointers.test.cpp"
-
     "acpi/test_data/tables.S"
   )
 
   target_include_directories("acpi_tests" PRIVATE
     "${CMAKE_CURRENT_BINARY_DIR}/test_data"
   )
-
-  target_link_libraries("acpi_tests" PRIVATE
-    "Catch2::Catch2WithMain"
-    "acpi::lib"
-  )
-
-  set_target_properties("acpi_tests" PROPERTIES
-    EXCLUDE_FROM_ALL NO
-  )
-
-  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bht_results")
-
-  catch_discover_tests("acpi::tests"
-    REPORTER junit
-    OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bht_results"
-    OUTPUT_SUFFIX ".xml"
-  )
 endif()
diff --git a/libs/acpi/acpi/common/table_header.cpp b/libs/acpi/acpi/common/table_header.cpp
index 6a7a4dc3..ebceca1d 100644
--- a/libs/acpi/acpi/common/table_header.cpp
+++ b/libs/acpi/acpi/common/table_header.cpp
@@ -1,7 +1,7 @@
 #include <acpi/common/table_header.hpp>
 
-#include <kstd/cstring>
-#include <kstd/units>
+#include <kstd/cstring.hpp>
+#include <kstd/units.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/acpi/acpi/common/table_header.hpp b/libs/acpi/acpi/common/table_header.hpp
index 471fed87..8e1d7c59 100644
--- a/libs/acpi/acpi/common/table_header.hpp
+++ b/libs/acpi/acpi/common/table_header.hpp
@@ -3,7 +3,7 @@
 
 // IWYU pragma: private, include <acpi/acpi.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/acpi/acpi/common/table_header.test.cpp b/libs/acpi/acpi/common/table_header.tests.cpp
index ddc879ed..bbd42bd6 100644
--- a/libs/acpi/acpi/common/table_header.test.cpp
+++ b/libs/acpi/acpi/common/table_header.tests.cpp
@@ -2,7 +2,7 @@
 
 #include <acpi/test_data/tables.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/libs/acpi/acpi/data/madt.cpp b/libs/acpi/acpi/data/madt.cpp
index 1a8b6d3a..fe6bae16 100644
--- a/libs/acpi/acpi/data/madt.cpp
+++ b/libs/acpi/acpi/data/madt.cpp
@@ -1,6 +1,6 @@
 #include <acpi/data/madt.hpp>
 
-#include <kstd/cstring>
+#include <kstd/cstring.hpp>
 
 #include <bit>
 #include <cstddef>
diff --git a/libs/acpi/acpi/data/madt.hpp b/libs/acpi/acpi/data/madt.hpp
index b76daa4f..4d992613 100644
--- a/libs/acpi/acpi/data/madt.hpp
+++ b/libs/acpi/acpi/data/madt.hpp
@@ -7,9 +7,9 @@
 #include <acpi/common/table_type.hpp>
 #include <acpi/common/vla_table.hpp>
 
-#include <kstd/ext/bitfield_enum>
+#include <kstd/ext/bitfield_enum.hpp>
 #include <kstd/os/error.hpp>
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/acpi/acpi/data/madt.test.cpp b/libs/acpi/acpi/data/madt.tests.cpp
index 1b95a74b..9ec0180a 100644
--- a/libs/acpi/acpi/data/madt.test.cpp
+++ b/libs/acpi/acpi/data/madt.tests.cpp
@@ -2,7 +2,7 @@
 
 #include <acpi/test_data/tables.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/libs/acpi/acpi/data/rsdt.cpp b/libs/acpi/acpi/data/rsdt.cpp
index 80e209db..a8626742 100644
--- a/libs/acpi/acpi/data/rsdt.cpp
+++ b/libs/acpi/acpi/data/rsdt.cpp
@@ -2,7 +2,7 @@
 
 #include <acpi/common/table_header.hpp>
 
-#include <kstd/cstring>
+#include <kstd/cstring.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/rsdt.test.cpp b/libs/acpi/acpi/data/rsdt.tests.cpp
index 47992ce6..826d0b4f 100644
--- a/libs/acpi/acpi/data/rsdt.test.cpp
+++ b/libs/acpi/acpi/data/rsdt.tests.cpp
@@ -3,7 +3,7 @@
 #include <acpi/acpi.hpp>
 #include <acpi/test_data/tables.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/libs/acpi/acpi/data/xsdt.cpp b/libs/acpi/acpi/data/xsdt.cpp
index b77aeab7..c4b109b8 100644
--- a/libs/acpi/acpi/data/xsdt.cpp
+++ b/libs/acpi/acpi/data/xsdt.cpp
@@ -2,7 +2,7 @@
 
 #include <acpi/common/table_header.hpp>
 
-#include <kstd/cstring>
+#include <kstd/cstring.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/acpi/acpi/data/xsdt.test.cpp b/libs/acpi/acpi/data/xsdt.tests.cpp
index 77a53408..19d9bcdb 100644
--- a/libs/acpi/acpi/data/xsdt.test.cpp
+++ b/libs/acpi/acpi/data/xsdt.tests.cpp
@@ -3,7 +3,7 @@
 #include <acpi/acpi.hpp>
 #include <acpi/test_data/tables.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/libs/acpi/acpi/pointers.cpp b/libs/acpi/acpi/pointers.cpp
index 2ac8d319..0393292c 100644
--- a/libs/acpi/acpi/pointers.cpp
+++ b/libs/acpi/acpi/pointers.cpp
@@ -2,7 +2,7 @@
 
 #include <acpi/common/checksum.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <bit>
 #include <cstddef>
diff --git a/libs/acpi/acpi/pointers.hpp b/libs/acpi/acpi/pointers.hpp
index 5771e7df..310447f5 100644
--- a/libs/acpi/acpi/pointers.hpp
+++ b/libs/acpi/acpi/pointers.hpp
@@ -3,7 +3,7 @@
 
 // IWYU pragma: private, include <acpi/acpi.hpp>
 
-#include <kstd/units>
+#include <kstd/units.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/acpi/acpi/pointers.test.cpp b/libs/acpi/acpi/pointers.tests.cpp
index d7b700d6..d7b700d6 100644
--- a/libs/acpi/acpi/pointers.test.cpp
+++ b/libs/acpi/acpi/pointers.tests.cpp