diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ed8497..969706e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,6 +59,16 @@ test-debug-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -87,6 +97,16 @@ test-release-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -115,6 +135,16 @@ test-debug-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -143,6 +173,16 @@ test-release-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -171,6 +211,16 @@ test-debug-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -199,6 +249,16 @@ test-release-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -227,6 +287,16 @@ test-debug-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -255,6 +325,16 @@ test-release-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + # ----------------- diff --git a/CI/ci-linux-test.sh b/CI/ci-linux-test.sh index 0c0cbc9f..a898cfed 100755 --- a/CI/ci-linux-test.sh +++ b/CI/ci-linux-test.sh @@ -42,7 +42,7 @@ echo -e "${NC}" cd Unittests #execute tests -./unittests --gtest_color=yes --gtest_output=xml +./unittests --gtest_color=yes --gtest_output="xml:report.xml" echo -e "${OUTPUT}" echo "" @@ -51,7 +51,7 @@ echo "Running unittests $BUILD_TYPE version with custom vector type" echo "======================================================================" echo -e "${NC}" -./unittests_customvec --gtest_color=yes --gtest_output=xml +./unittests_customvec --gtest_color=yes --gtest_output="xml:report-customvec.xml" echo -e "${OUTPUT}" echo "" @@ -61,7 +61,7 @@ echo "======================================================================" echo -e "${NC}" #execute tests -./unittests_doublevec --gtest_color=yes --gtest_output=xml +./unittests_doublevec --gtest_color=yes --gtest_output="xml:report-doublevec.xml" cd .. -cd .. \ No newline at end of file +cd .. diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index b8eca4b6..b199f04b 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -10,3 +10,13 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml +