mac test

.gitlab-ci.yml

@@ -322,40 +322,91 @@ test-release-clang-cpp14:
 
 
 # -----------------
-# 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"
+    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:
+#-----------  Job Informations:
-  stage: build
+# Type:       Build+Test: release
-  script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug"
+# OS:         Mac
-  tags:
+# Language:   cpp11
-    - Apple
 
 macos-cpp11-release:
     stage: build
-  script: "CI/ci-mac-build.sh C++11 release ; CI/ci-mac-test.sh C++11 release"
+    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"
+    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

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/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:
+{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp11}
-  stage: build
+{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp11}
-  script: "CI/ci-mac-build.sh C++11 debug ; CI/ci-mac-test.sh C++11 debug"
-  tags:
-    - Apple
 
-macos-cpp14-debug:
+{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp14}
-  stage: build
+{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp14}
-  script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug"
-  tags:
-    - Apple
 
-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