aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--kernel/CMakeLists.txt9
-rw-r--r--libs/acpi/CMakeLists.txt8
-rw-r--r--libs/kstd/CMakeLists.txt8
4 files changed, 23 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80219e1..7b0d2a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ test:bht:
coverage_report:
coverage_format: cobertura
path: coverage/cobertura-coverage.xml
- junit: build/bht/**/junit.xml
+ junit: build/bht/**/bht_results/*.xml
license_check:
stage: .pre
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 2388370..88506ff 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -225,5 +225,12 @@ if(BUILD_TESTING)
)
enable_coverage("kernel_tests")
- catch_discover_tests("kernel_tests" ${CATCH_TEST_ARGS})
+
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bht_results")
+
+ catch_discover_tests("kernel::tests"
+ RERPORTER junit
+ OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bht_results"
+ OUTPUT_SUFFIX ".xml"
+ )
endif()
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index 1d03bb5..d48922f 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -114,5 +114,11 @@ if(BUILD_TESTING)
EXCLUDE_FROM_ALL NO
)
- catch_discover_tests("acpi::tests" ${CATCH_TEST_ARGS})
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bht_results")
+
+ catch_discover_tests("acpi::tests"
+ RERPORTER junit
+ OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bht_results"
+ OUTPUT_SUFFIX ".xml"
+ )
endif()
diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt
index 99ce0c8..9bf91b6 100644
--- a/libs/kstd/CMakeLists.txt
+++ b/libs/kstd/CMakeLists.txt
@@ -97,5 +97,11 @@ if(BUILD_TESTING)
enable_coverage("kstd_tests")
endif()
- catch_discover_tests("kstd::tests" ${CATCH_TEST_ARGS})
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bht_results")
+
+ catch_discover_tests("kstd::tests"
+ RERPORTER junit
+ OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/bht_results"
+ OUTPUT_SUFFIX ".xml"
+ )
endif() \ No newline at end of file