1 files changed, 6 insertions, 58 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index d50944e4..34d71de1 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -140,79 +140,32 @@ endif()
 if(BUILD_TESTING)
     find_package("Catch2")
     include("Catch")
+    include("BuildHostTests")
 
-    enable_coverage("kernel_lib")
-
-    add_executable("kernel_tests")
-    add_executable("kernel::tests" ALIAS "kernel_tests")
+    teachos_add_tests("kernel")
 
     target_sources("kernel_tests" PRIVATE
-        # Platform-defined KAPI
         "kernel/test_support/kapi/cpu.cpp"
         "kernel/test_support/kapi/cio.cpp"
         "kernel/test_support/kapi/interrupts.cpp"
         "kernel/test_support/kapi/memory.cpp"
 
-        # Device Subsystem Support
         "kernel/test_support/devices/block_device.cpp"
         "kernel/test_support/devices/character_device.cpp"
 
-        # Filesystem Subsystem Support
         "kernel/test_support/filesystem/inode.cpp"
         "kernel/test_support/filesystem/filesystem.cpp"
         "kernel/test_support/filesystem/ext2.cpp"
         "kernel/test_support/filesystem/storage_boot_module_fixture.cpp"
         "kernel/test_support/filesystem/storage_boot_module_vfs_fixture.cpp"
 
-        # I/O Support
         "kernel/test_support/log_buffer.cpp"
         "kernel/test_support/output_device.cpp"
 
-        # Memory Support
         "kernel/test_support/page_mapper.cpp"
         "kernel/test_support/simulated_memory.cpp"
 
-        # Support System Listener
         "kernel/test_support/state_reset_listener.cpp"
-
-        # KAPI Shim Tests
-        "kapi/cpu.tests.cpp"
-        "kapi/system.tests.cpp"
-        "kapi/filesystem.tests.cpp"
-
-        # KSTD Shim Tests
-        "kstd/print.tests.cpp"
-
-        # Memory Subsystem Tests
-        "kernel/memory/bitmap_allocator.tests.cpp"
-        "kernel/memory/block_list_allocator.tests.cpp"
-
-        # Filesystem Subsystem Tests
-        "kernel/filesystem/devfs/filesystem.tests.cpp"
-        "kernel/filesystem/devfs/inode.tests.cpp"
-        "kernel/filesystem/ext2/filesystem.tests.cpp"
-        "kernel/filesystem/ext2/inode.tests.cpp"
-        "kernel/filesystem/path.tests.cpp"
-        "kernel/filesystem/rootfs/filesystem.tests.cpp"
-        "kernel/filesystem/rootfs/inode.tests.cpp"
-        "kernel/filesystem/dentry.tests.cpp"
-        "kernel/filesystem/device_inode.tests.cpp"
-        "kernel/filesystem/mount_table.tests.cpp"
-        "kernel/filesystem/mount.tests.cpp"
-        "kernel/filesystem/open_file_descriptor.tests.cpp"
-        "kernel/filesystem/open_file_table.tests.cpp"
-        "kernel/filesystem/type_registry.tests.cpp"
-        "kernel/filesystem/vfs.tests.cpp"
-        
-        # Storage Subsystem Tests
-        "kernel/devices/block_device_utils.tests.cpp"
-        "kernel/devices/block_device.tests.cpp"
-        "kernel/devices/storage/ram_disk/device.tests.cpp"
-    )
-
-    target_link_libraries("kernel_tests" PRIVATE
-        "kernel::lib"
-        "Catch2::Catch2WithMain"
     )
 
     target_compile_definitions("kernel_tests" PRIVATE
@@ -224,13 +177,8 @@ if(BUILD_TESTING)
         CXX_CLANG_TIDY ""
     )
 
-    enable_coverage("kernel_tests")
-
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bht_results")
-
-    catch_discover_tests("kernel::tests"
-        REPORTER junit
-        OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bht_results"
-        OUTPUT_SUFFIX ".xml"
-    )
+    if(COMMAND "enable_coverage")
+        enable_coverage("kernel_lib")
+        enable_coverage("kernel_tests")
+    endif()
 endif()