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

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,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 ..

CI/ci-mac-prepare.sh

@@ -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"

CI/gitlab-ci/linux-template-test-job.yml

@@ -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
+

CI/gitlab-ci/mac-template-job.yml

@@ -0,0 +1,20 @@
+#-----------  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
+

CI/gitlab-ci/mac.yml

@@ -1,35 +1,10 @@
 # -----------------
-# 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