Commit a3622649 authored by Johannes Lenzen's avatar Johannes Lenzen
Browse files

Merge remote-tracking branch 'origin/master' into unittests_windows

parents 9df37090 d1b58ff7
......@@ -59,6 +59,14 @@ test-debug-gcc-cpp11:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-debug-gcc-cpp11]
needs: [build-debug-gcc-cpp11]
artifacts:
reports:
junit:
- build-gcc-cpp11-debug-Vector-Checks/Unittests/report.xml
- build-gcc-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml
- build-gcc-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: release
......@@ -87,6 +95,14 @@ test-release-gcc-cpp11:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-release-gcc-cpp11]
needs: [build-release-gcc-cpp11]
artifacts:
reports:
junit:
- build-gcc-cpp11-release-Vector-Checks/Unittests/report.xml
- build-gcc-cpp11-release-Vector-Checks/Unittests/report-customvec.xml
- build-gcc-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: debug
......@@ -115,6 +131,14 @@ test-debug-clang-cpp11:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-debug-clang-cpp11]
needs: [build-debug-clang-cpp11]
artifacts:
reports:
junit:
- build-clang-cpp11-debug-Vector-Checks/Unittests/report.xml
- build-clang-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml
- build-clang-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: release
......@@ -143,6 +167,14 @@ test-release-clang-cpp11:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-release-clang-cpp11]
needs: [build-release-clang-cpp11]
artifacts:
reports:
junit:
- build-clang-cpp11-release-Vector-Checks/Unittests/report.xml
- build-clang-cpp11-release-Vector-Checks/Unittests/report-customvec.xml
- build-clang-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: debug
......@@ -171,6 +203,14 @@ test-debug-gcc-cpp14:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-debug-gcc-cpp14]
needs: [build-debug-gcc-cpp14]
artifacts:
reports:
junit:
- build-gcc-cpp14-debug-Vector-Checks/Unittests/report.xml
- build-gcc-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml
- build-gcc-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: release
......@@ -199,6 +239,14 @@ test-release-gcc-cpp14:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-release-gcc-cpp14]
needs: [build-release-gcc-cpp14]
artifacts:
reports:
junit:
- build-gcc-cpp14-release-Vector-Checks/Unittests/report.xml
- build-gcc-cpp14-release-Vector-Checks/Unittests/report-customvec.xml
- build-gcc-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: debug
......@@ -227,6 +275,14 @@ test-debug-clang-cpp14:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-debug-clang-cpp14]
needs: [build-debug-clang-cpp14]
artifacts:
reports:
junit:
- build-clang-cpp14-debug-Vector-Checks/Unittests/report.xml
- build-clang-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml
- build-clang-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build: release
......@@ -255,43 +311,102 @@ test-release-clang-cpp14:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-release-clang-cpp14]
needs: [build-release-clang-cpp14]
artifacts:
reports:
junit:
- build-clang-cpp14-release-Vector-Checks/Unittests/report.xml
- build-clang-cpp14-release-Vector-Checks/Unittests/report-customvec.xml
- build-clang-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml
# -----------------
# Apple tasks
# MAC tasks
# -----------------
#----------- Job Informations:
# Type: Build+Test: debug
# OS: Mac
# Language: cpp11
macos-cpp11-debug:
stage: build
script: "CI/ci-mac-build.sh C++11 debug ; CI/ci-mac-test.sh C++11 debug"
tags:
- Apple
stage: build
script: "CI/ci-mac-build.sh cpp11 debug ; CI/ci-mac-test.sh cpp11 debug"
tags:
- Apple
artifacts:
paths:
- build-debug-cpp11/*.dmg
- build-debug-cpp11/*.tar.gz
# reports:
# junit:
# - build-debug-cpp11/Unittests/report.xml
# - build-debug-cpp11/Unittests/report-customvec.xml
# - build-debug-cpp11/Unittests/report-doublevec.xml
macos-cpp14-debug:
stage: build
script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug"
tags:
- Apple
#----------- Job Informations:
# Type: Build+Test: release
# OS: Mac
# Language: cpp11
macos-cpp11-release:
stage: build
script: "CI/ci-mac-build.sh C++11 release ; CI/ci-mac-test.sh C++11 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
stage: build
script: "CI/ci-mac-build.sh cpp11 release ; CI/ci-mac-test.sh cpp11 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
# reports:
# junit:
# - build-release-cpp11/Unittests/report.xml
# - build-release-cpp11/Unittests/report-customvec.xml
# - build-release-cpp11/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build+Test: debug
# OS: Mac
# Language: cpp14
macos-cpp14-debug:
stage: build
script: "CI/ci-mac-build.sh cpp14 debug ; CI/ci-mac-test.sh cpp14 debug"
tags:
- Apple
artifacts:
paths:
- build-debug-cpp14/*.dmg
- build-debug-cpp14/*.tar.gz
# reports:
# junit:
# - build-debug-cpp14/Unittests/report.xml
# - build-debug-cpp14/Unittests/report-customvec.xml
# - build-debug-cpp14/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build+Test: release
# OS: Mac
# Language: cpp14
macos-cpp14-release:
stage: build
script: "CI/ci-mac-build.sh C++14 release ; CI/ci-mac-test.sh C++14 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp14/*.dmg
- build-release-cpp14/*.tar.gz
stage: build
script: "CI/ci-mac-build.sh cpp14 release ; CI/ci-mac-test.sh cpp14 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp14/*.dmg
- build-release-cpp14/*.tar.gz
# reports:
# junit:
# - build-release-cpp14/Unittests/report.xml
# - build-release-cpp14/Unittests/report-customvec.xml
# - build-release-cpp14/Unittests/report-doublevec.xml
# -----------------
# Windows tasks
......
......@@ -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,10 @@ 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
pwd
ls *.xml
cd ..
cd ..
cd ..
\ No newline at end of file
......@@ -14,14 +14,14 @@ OPTIONS=""
# set GTEST path
OPTIONS="$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
if [ "$LANGUAGE" == "C++98" ]; then
if [ "$LANGUAGE" == "cpp98" ]; then
echo "Building with C++98";
BUILDPATH="cpp98"
elif [ "$LANGUAGE" == "C++11" ]; then
elif [ "$LANGUAGE" == "cpp11" ]; then
echo "Building with C++11";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
BUILDPATH="cpp11"
elif [ "$LANGUAGE" == "C++14" ]; then
elif [ "$LANGUAGE" == "cpp14" ]; then
echo "Building with C++14";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' "
BUILDPATH="cpp14"
......
......@@ -10,3 +10,11 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}:
image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
tags: [Docker]
dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}]
needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}]
artifacts:
reports:
junit:
- build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report.xml
- build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-customvec.xml
- build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-doublevec.xml
#----------- Job Informations:
# Type: Build+Test: {{BUILDTYPE}}
# OS: Mac
# Language: {{LANGUAGE}}
macos-{{LANGUAGE}}-{{BUILDTYPE}}:
stage: build
script: "CI/ci-mac-build.sh {{LANGUAGE}} {{BUILDTYPE}} ; CI/ci-mac-test.sh {{LANGUAGE}} {{BUILDTYPE}}"
tags:
- Apple
artifacts:
paths:
- build-{{BUILDTYPE}}-{{LANGUAGE}}/*.dmg
- build-{{BUILDTYPE}}-{{LANGUAGE}}/*.tar.gz
# reports:
# junit:
# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report.xml
# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-customvec.xml
# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-doublevec.xml
# -----------------
# Apple tasks
# MAC tasks
# -----------------
macos-cpp11-debug:
stage: build
script: "CI/ci-mac-build.sh C++11 debug ; CI/ci-mac-test.sh C++11 debug"
tags:
- Apple
{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp11}
{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp11}
macos-cpp14-debug:
stage: build
script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug"
tags:
- Apple
{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp14}
{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp14}
macos-cpp11-release:
stage: build
script: "CI/ci-mac-build.sh C++11 release ; CI/ci-mac-test.sh C++11 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
macos-cpp14-release:
stage: build
script: "CI/ci-mac-build.sh C++14 release ; CI/ci-mac-test.sh C++14 release"
tags:
- Apple
artifacts:
paths:
- build-release-cpp14/*.dmg
- build-release-cpp14/*.tar.gz
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