Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unittests_windows' into 'master'

Browse Source 
Windows unitests gitlab integration

See merge request OpenMesh/OpenMesh!268
This commit is contained in:
Jan Möbius
2020-05-26 14:44:28 +02:00
parent d1b58ff786 a36226490c
commit a936d398fb
5 changed files with 156 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
.gitlab-ci.yml
View File

@@ -412,7 +412,15 @@ macos-cpp14-release:
# Windows tasks # Windows tasks
# ----------------- # -----------------
VS2017-64-bit-shared-apps: #------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: TRUE
# VS Version: VS2017
# Apps: {{APPS}}
build-VS2017-x64-shared-TRUE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -426,8 +434,40 @@ VS2017-64-bit-shared-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
VS2017-64-bit-static-apps: build-VS2017-x64-shared-TRUE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: FALSE
# VS Version: VS2017
# Apps: {{APPS}}
build-VS2017-x64-shared-FALSE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -441,23 +481,13 @@ VS2017-64-bit-static-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2017-x64-shared-FALSE-no-apps:
VS2017-64-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
@@ -470,8 +500,22 @@ VS2017-64-bit-static-no-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
VS2015-64-bit-shared-apps:
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: TRUE
# VS Version: VS2015
# Apps: {{APPS}}
build-VS2015-x64-shared-TRUE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -481,12 +525,17 @@ VS2015-64-bit-shared-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2015-x64-shared-TRUE-no-apps:
VS2015-64-bit-shared-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -499,8 +548,21 @@ VS2015-64-bit-shared-no-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
VS2015-64-bit-static-apps: #------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: FALSE
# VS Version: VS2015
# Apps: {{APPS}}
build-VS2015-x64-shared-FALSE-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -510,11 +572,17 @@ VS2015-64-bit-static-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
VS2015-64-bit-static-no-apps: build-VS2015-x64-shared-FALSE-no-apps:
stage: build stage: build
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
@@ -527,6 +595,12 @@ VS2015-64-bit-static-no-apps:
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
Doc-publish: Doc-publish:
stage: deploy stage: deploy

6
CI/Windows.bat
View File

@@ -115,11 +115,11 @@ IF %errorlevel% NEQ 0 exit /b %errorlevel%
cd unittests 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 .. cd ..

6
CI/ci-mac-test.sh
View File

@@ -40,7 +40,7 @@ echo -e "${NC}"
cd Unittests cd Unittests
#execute tests #execute tests
./unittests --gtest_color=yes --gtest_output=xml ./unittests --gtest_color=yes --gtest_output=xml:./report.xml
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
echo "" echo ""
@@ -49,7 +49,7 @@ echo "Running unittests $BUILD_TYPE version with minimal vector type"
echo "======================================================================" echo "======================================================================"
echo -e "${NC}" 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 -e "${OUTPUT}"
echo "" echo ""
@@ -59,7 +59,7 @@ echo "======================================================================"
echo -e "${NC}" echo -e "${NC}"
#execute tests #execute tests
./unittests_doublevec --gtest_color=yes --gtest_output=xml ./unittests_doublevec --gtest_color=yes --gtest_output=xml:./report-doublevec.xml
cd .. cd ..
cd .. cd ..

47
CI/gitlab-ci/windows-template-job.yml Normal file
View File

@@ -0,0 +1,47 @@
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: {{ARCHITECTURE}}
# Shared: {{SHARED}}
# VS Version: {{VSVERSION}}
# Apps: {{APPS}}
build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-apps:
stage: build
variables:
BUILD_PLATFORM: "{{VSVERSION}}"
ARCHITECTURE: "{{ARCHITECTURE}}"
SHARED: "{{SHARED}}"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- {{VSVERSION}}
- {{QTTAG}}
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps:
stage: build
variables:
BUILD_PLATFORM: "{{VSVERSION}}"
ARCHITECTURE: "{{ARCHITECTURE}}"
SHARED: "{{SHARED}}"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- {{VSVERSION}}
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml

118
CI/gitlab-ci/windows.yml
View File

@@ -2,118 +2,8 @@
# Windows tasks # Windows tasks
# ----------------- # -----------------
VS2017-64-bit-shared-apps: {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
stage: build {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-apps: {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101}
stage: build {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe