Commit a936d398 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'unittests_windows' into 'master'

Windows unitests gitlab integration

See merge request !268
parents d1b58ff7 a3622649
......@@ -412,7 +412,15 @@ macos-cpp14-release:
# 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
variables:
BUILD_PLATFORM: "VS2017"
......@@ -425,39 +433,61 @@ VS2017-64-bit-shared-apps:
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-apps:
- 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-TRUE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-shared-no-apps:
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
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- 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-no-apps:
build-VS2017-x64-shared-FALSE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
......@@ -470,8 +500,22 @@ VS2017-64-bit-static-no-apps:
artifacts:
paths:
- 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
variables:
BUILD_PLATFORM: "VS2015"
......@@ -481,12 +525,17 @@ VS2015-64-bit-shared-apps:
script: "CI\\Windows.bat"
tags:
- VS2015
- Qt5101
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-no-apps:
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:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
......@@ -499,8 +548,21 @@ VS2015-64-bit-shared-no-apps:
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-apps:
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: VS2015
# Apps: {{APPS}}
build-VS2015-x64-shared-FALSE-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
......@@ -510,11 +572,17 @@ VS2015-64-bit-static-apps:
script: "CI\\Windows.bat"
tags:
- VS2015
- Qt5101
artifacts:
paths:
- 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
variables:
BUILD_PLATFORM: "VS2015"
......@@ -527,6 +595,12 @@ VS2015-64-bit-static-no-apps:
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
Doc-publish:
stage: deploy
......
......@@ -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 ..
......
......@@ -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
#------------- 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
......@@ -2,118 +2,8 @@
# Windows tasks
# -----------------
VS2017-64-bit-shared-apps:
stage: build
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:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts:
paths:
- build-release/*.exe
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
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
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment