1 files changed, 41 insertions, 1 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 854fb33..d6b3a1b 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -87,6 +87,46 @@ if(CMAKE_CROSSCOMPILING)
     target_generate_bootable_iso("kernel")
 else()
     enable_coverage("kernel_objs")
-    add_subdirectory("tests")
+
+    add_library("kernel_test_support"
+        "src/test_support/kapi/cpu.cpp"
+        "src/test_support/kapi/cio.cpp"
+        "src/test_support/kapi/interrupts.cpp"
+        "src/test_support/kapi/memory.cpp"
+        "src/test_support/log_buffer.cpp"
+        "src/test_support/simulated_memory.cpp"
+    )
+    add_library("os::kernel_test_support" ALIAS "kernel_test_support")
+
+    target_link_libraries("kernel_test_support" PUBLIC
+        "os::kernel"
+        "Catch2::Catch2"
+    )
+
+    add_executable("kernel_tests"
+        # KAPI Shim Tests
+        "kapi/cpu.tests.cpp"
+        "kapi/system.tests.cpp"
+        
+        # KSTD Shim Tests
+        "kstd/print.tests.cpp"
+        
+        # Test Executable Main
+        "src/main.tests.cpp"
+    )
+    add_executable("os::kernel_tests" ALIAS "kernel_tests")
+
+    target_link_libraries("kernel_tests" PRIVATE
+        "os::kernel_test_support"
+    )
+
+    set_target_properties("kernel_tests" PROPERTIES
+        C_CLANG_TIDY ""
+        CXX_CLANG_TIDY ""
+        EXCLUDE_FROM_ALL NO
+    )
+
+    enable_coverage("kernel_tests")
+    catch_discover_tests("os::kernel_tests")
 endif()