diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-05-18 15:32:41 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-05-18 15:32:41 +0200 |
| commit | f858bc83734d34bb463ee0217bbebbc14e1e6636 (patch) | |
| tree | e5c7757683a83843f3439e64b1b8b0b5d0497da2 | |
| parent | 1f12f7d107fb0db5ab33a92a20ee05db2489dc28 (diff) | |
| parent | a50d6cfcea67b11f6689ec825afc2e2b33252714 (diff) | |
| download | kernel-f858bc83734d34bb463ee0217bbebbc14e1e6636.tar.xz kernel-f858bc83734d34bb463ee0217bbebbc14e1e6636.zip | |
Merge branch 'fmorgner/develop-BA-FS26/junit-test-reporting' into 'develop-BA-FS26'
Enable jUnit style test reports
See merge request teachos/kernel!40
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/acpi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/kstd/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 774708b..7551708 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,7 @@ test:bht: coverage_report: coverage_format: cobertura path: coverage/cobertura-coverage.xml + junit: build/bht/**/junit.xml license_check: stage: .pre diff --git a/CMakeLists.txt b/CMakeLists.txt index fb5b101..8118e0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ if (BUILD_TESTING) include("Catch") add_compile_definitions("CATCH_CONFIG_NO_COUNTER") + set(CATCH_TEST_ARGS "EXTRA_ARGS" "--reporter" "junit::out=junit.xml" "--reporter" "console::out=-::colour-mode=ansi") endif() #[============================================================================[ diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 860e28b..2ce9621 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -220,5 +220,5 @@ if(BUILD_TESTING) ) enable_coverage("kernel_tests") - catch_discover_tests("kernel_tests") + catch_discover_tests("kernel_tests" ${CATCH_TEST_ARGS}) endif() diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt index 2c4d76d..135ce6a 100644 --- a/libs/acpi/CMakeLists.txt +++ b/libs/acpi/CMakeLists.txt @@ -132,5 +132,5 @@ if(BUILD_TESTING) EXCLUDE_FROM_ALL NO ) - catch_discover_tests("acpi_tests") + catch_discover_tests("acpi_tests" ${CATCH_TEST_ARGS}) endif() diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt index 6902891..1cc75b7 100644 --- a/libs/kstd/CMakeLists.txt +++ b/libs/kstd/CMakeLists.txt @@ -114,5 +114,5 @@ if(BUILD_TESTING) enable_coverage("kstd_tests") endif() - catch_discover_tests("kstd::tests") + catch_discover_tests("kstd::tests" ${CATCH_TEST_ARGS}) endif()
\ No newline at end of file |