diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c461647..089c8ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,14 +50,9 @@ test: script: - cd build - make build-test - - make build-xml artifacts: reports: junit: build/report.xml - paths: - - build/ - - inc/ - - postinst dependencies: - build diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d341ab..ed2a914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -353,12 +353,8 @@ if (TESTS) package_add_test(test1 tests/UnitTest.cpp ${SOURCE}) add_custom_target(build-test - "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target test1 test - DEPENDS ${PROJECT_NAME} - COMMENT "Packing ${PROJECT_NAME}") - - add_custom_target(build-xml - "bin/test1" --gtest_output="xml:report.xml" + "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target test1 + COMMAND ctest --force-new-ctest-process --gtest_output="xml:report.xml" DEPENDS ${PROJECT_NAME} COMMENT "Packing ${PROJECT_NAME}") else ()