From 0508a448979d850442b0df35d4fbe06f4bfb7ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sun, 15 Sep 2019 23:07:56 +0200
Subject: ci: Add a junit output to test_suite and give it to gitlab

---
 .gitlab-ci.yml | 11 +++++++----
 CMakeLists.txt |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3ee938..4be11d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,8 +131,11 @@ build:no_db_botan:
     - docker
   script:
     - cd build/
-    - make check -j$(nproc || echo 1)
-    - make e2e -j$(nproc || echo 1)
+    - make check_junit || true; make check;
+    - make e2e
+  artifacts:
+    reports:
+      junit: ["build/check_result.xml"]
 
 test:debian:
   extends: .basic_test
@@ -146,8 +149,8 @@ test:fedora:
   image: docker.louiz.org/louiz/biboumi/test-fedora:latest
   script:
     - cd build/
-    - make coverage_check -j$(nproc || echo 1)
-    - make coverage_e2e -j$(nproc || echo 1)
+    - make coverage_check
+    - make coverage_e2e
     - make coverage
   dependencies:
     - build:fedora
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a8d99a..b6a9437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,6 +313,8 @@ endif()
 #
 add_custom_target(check COMMAND "test_suite"
   DEPENDS test_suite)
+add_custom_target(check_junit COMMAND test_suite -r junit -o check_result.xml
+  DEPENDS test_suite)
 set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL TRUE)
 add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/"
   DEPENDS biboumi)
@@ -323,13 +325,14 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
   include(CodeCoverage)
   SETUP_TARGET_FOR_COVERAGE(coverage_check
     ./test_suite
-    coverage_test_suite)
+    coverage_test_suite
+    "-r junit -o check_result.xml")
   add_dependencies(coverage_check test_suite)
 
   SETUP_TARGET_FOR_COVERAGE(coverage_e2e
     python3
     coverage_e2e
-    ${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/)
+    "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/")
   add_dependencies(coverage_e2e biboumi)
 
   ADD_CUSTOM_TARGET(coverage
-- 
cgit v1.2.3