diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9f4bc08..aea39f46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,7 +318,12 @@ build-VS2017-x64-shared-TRUE-apps: - Qt5101 artifacts: paths: - - build-release/*.exe + - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml build-VS2017-x64-shared-TRUE-no-apps: stage: build @@ -333,6 +338,12 @@ build-VS2017-x64-shared-TRUE-no-apps: artifacts: paths: - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml + #------------- Job Informations: # Type: Build+Test: Release # OS: Windows @@ -354,7 +365,12 @@ build-VS2017-x64-shared-FALSE-apps: - Qt5101 artifacts: paths: - - build-release/*.exe + - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml build-VS2017-x64-shared-FALSE-no-apps: stage: build @@ -369,6 +385,12 @@ build-VS2017-x64-shared-FALSE-no-apps: artifacts: paths: - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml + #------------- Job Informations: # Type: Build+Test: Release @@ -391,7 +413,12 @@ build-VS2015-x64-shared-TRUE-apps: - Qt5101 artifacts: paths: - - build-release/*.exe + - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml build-VS2015-x64-shared-TRUE-no-apps: stage: build @@ -406,6 +433,12 @@ build-VS2015-x64-shared-TRUE-no-apps: artifacts: paths: - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml + #------------- Job Informations: # Type: Build+Test: Release # OS: Windows @@ -427,7 +460,12 @@ build-VS2015-x64-shared-FALSE-apps: - Qt5101 artifacts: paths: - - build-release/*.exe + - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml build-VS2015-x64-shared-FALSE-no-apps: stage: build @@ -442,6 +480,12 @@ build-VS2015-x64-shared-FALSE-no-apps: artifacts: paths: - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml + Doc-publish: stage: deploy diff --git a/CI/Windows.bat b/CI/Windows.bat index 18933585..616dcf27 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -115,11 +115,11 @@ IF %errorlevel% NEQ 0 exit /b %errorlevel% cd unittests -unittests.exe --gtest_output=xml +unittests.exe --gtest_output=xml:./report.xml -unittests_customvec.exe --gtest_output=xml +unittests_customvec.exe --gtest_output=xml:./report-customvec.xml -unittests_doublevec.exe --gtest_output=xml +unittests_doublevec.exe --gtest_output=xml:./report-doublevec.xml cd .. diff --git a/CI/ci-mac-test.sh b/CI/ci-mac-test.sh index de25ba39..deeee00d 100755 --- a/CI/ci-mac-test.sh +++ b/CI/ci-mac-test.sh @@ -40,7 +40,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 "" @@ -49,7 +49,7 @@ echo "Running unittests $BUILD_TYPE version with minimal 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 "" @@ -59,7 +59,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 diff --git a/CI/gitlab-ci/windows-template-job.yml b/CI/gitlab-ci/windows-template-job.yml index 2c31c4f9..0d5eb8c3 100644 --- a/CI/gitlab-ci/windows-template-job.yml +++ b/CI/gitlab-ci/windows-template-job.yml @@ -19,7 +19,12 @@ build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-apps: - {{QTTAG}} artifacts: paths: - - build-release/*.exe + - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps: stage: build @@ -34,3 +39,9 @@ build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps: artifacts: paths: - build-release/*.exe + reports: + junit: + - build-release/report.xml + - build-release/report-customvec.xml + - build-release/report-doublevec.xml +