From 5a4342e69ecc19d1408f622ceb7f8a8bbe6c1d20 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 20 Aug 2026 11:27:04 +0200 Subject: build: improve linting exclusions for tests --- cmake/Modules/BuildHostTests.cmake | 8 ++++++++ kernel/CMakeLists.txt | 39 ++++++++++++-------------------------- libs/kstd/CMakeLists.txt | 4 ++-- libs/multiboot2/CMakeLists.txt | 4 ++-- 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/cmake/Modules/BuildHostTests.cmake b/cmake/Modules/BuildHostTests.cmake index d92c3308..9edc0afa 100644 --- a/cmake/Modules/BuildHostTests.cmake +++ b/cmake/Modules/BuildHostTests.cmake @@ -11,6 +11,10 @@ function("teachos_add_tests" NAME) "*.tests.cpp" ) + set_source_files_properties(${TEST_SOURCES} PROPERTIES + SKIP_LINTING YES + ) + target_sources("${NAME}_tests" PRIVATE ${TEST_SOURCES} ) @@ -44,6 +48,10 @@ function("teachos_add_stress_tests" NAME) "*.stress.cpp" ) + set_source_files_properties(${TEST_SOURCES} PROPERTIES + SKIP_LINTING YES + ) + target_sources("${NAME}_stress_tests" PRIVATE ${TEST_SOURCES} ) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index d286b2aa..0ac72a18 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -90,6 +90,8 @@ file(GLOB_RECURSE KERNEL_HEADERS "kernel/**.hpp" ) +list(FILTER KERNEL_HEADERS EXCLUDE REGEX "test_support") + target_sources("kernel_lib" PUBLIC FILE_SET HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" @@ -165,41 +167,24 @@ if(BUILD_TESTING) set(TEST_TARGET "kernel_tests") endif() - target_sources("${TEST_TARGET}" PRIVATE - "kernel/test_support/kapi/boot_modules.cpp" - "kernel/test_support/kapi/cpu.cpp" - "kernel/test_support/kapi/cio.cpp" - "kernel/test_support/kapi/interrupts.cpp" - "kernel/test_support/kapi/memory.cpp" - - "kernel/test_support/devices/block_device.cpp" - "kernel/test_support/devices/character_device.cpp" - "kernel/test_support/devices/driver.cpp" - - "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" - - "kernel/test_support/log_buffer.cpp" - "kernel/test_support/output_device.cpp" + file(GLOB_RECURSE KERNEL_TEST_SUPPORT_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + CONFIGURE_DEPENDS + "kernel/test_support/**.[ch]pp" + ) - "kernel/test_support/page_mapper.cpp" - "kernel/test_support/simulated_memory.cpp" + set_source_files_properties(${KERNEL_TEST_SUPPORT_SOURCES} PROPERTIES + SKIP_LINTING YES + ) - "kernel/test_support/state_reset_listener.cpp" + target_sources("${TEST_TARGET}" PRIVATE + ${KERNEL_TEST_SUPPORT_SOURCES} ) target_compile_definitions("${TEST_TARGET}" PRIVATE KERNEL_TEST_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/kernel/test_support/filesystem/test_assets" ) - set_target_properties("${TEST_TARGET}" PROPERTIES - C_CLANG_TIDY "" - CXX_CLANG_TIDY "" - ) - if(COMMAND "enable_coverage" AND TEACHOS_ENABLE_TEST_COVERAGE) enable_coverage("kernel_lib") enable_coverage("${TEST_TARGET}") diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt index ada786a4..753f674f 100644 --- a/libs/kstd/CMakeLists.txt +++ b/libs/kstd/CMakeLists.txt @@ -31,10 +31,10 @@ target_sources("kstd" PRIVATE file(GLOB_RECURSE KSTD_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS - "kstd/*" + "kstd/**.hpp" ) -list(FILTER KSTD_HEADERS EXCLUDE REGEX ".*\.cpp") +list(FILTER KSTD_HEADERS EXCLUDE REGEX "test_support") target_sources("kstd" PUBLIC FILE_SET HEADERS diff --git a/libs/multiboot2/CMakeLists.txt b/libs/multiboot2/CMakeLists.txt index 5ab56dbe..2590ad5d 100644 --- a/libs/multiboot2/CMakeLists.txt +++ b/libs/multiboot2/CMakeLists.txt @@ -18,12 +18,12 @@ add_library("multiboot2::lib" ALIAS "multiboot2") file(GLOB_RECURSE MULTIBOOT2_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS - "include/**.hpp" + "multiboot2/**.hpp" ) target_sources("multiboot2" INTERFACE FILE_SET HEADERS - BASE_DIRS "include" + BASE_DIRS "multiboot2" FILES ${MULTIBOOT2_HEADERS} ) -- cgit v1.2.3