From 505046c97b0abcd63ca2c087ab43ea1854a3a5d1 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 28 Dec 2018 12:23:01 +0100
Subject: [PATCH] copy all test outputs into one directory
---
.gitlab-ci.yml | 8 ++------
CMakeModules/CorsikaUtilities.cmake | 3 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cf0a781..ab91b4a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build:
- cd build
- cmake ..
- cmake --build .
- - ctest -V >& test.log
+ - ctest -j4 -V >& test.log
- gzip -9 test.log
artifacts:
paths:
@@ -24,11 +24,7 @@ build:
when: on_failure
reports:
junit:
- - */junit*.xml
- - */*/junit*.xml
- - */*/*/junit*.xml
- - */*/*/*/junit*.xml
- - */*/*/*/*/junit*.xml
+ - build/test_outputs/junit*.xml
# code_quality:
# image: docker:stable
diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index abcebea9..c2a7df5c 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -86,5 +86,6 @@ endmacro(CORSIKA_ADD_FILES_ABSOLUTE)
#
function (CORSIKA_ADD_TEST name)
- add_test (NAME ${name} COMMAND ${name} -o junit-${name}.xml -r junit)
+ file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_outputs/)
+ add_test (NAME ${name} COMMAND ${name} -o ${PROJECT_BINARY_DIR}/test_outputs/junit-${name}.xml -r junit)
endfunction (CORSIKA_ADD_TEST)
--
GitLab