summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2019-04-06 15:22:04 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2019-04-06 15:31:41 +0100
commit95b7a8ab10e484c7e8f929a592971a7f296e8ce2 (patch)
tree5b2393832eea8349dc97c772ebd2efb500f0f9fb
parented65996300a52007c815d03314ba49f29b15e91b (diff)
downloadglib-95b7a8ab10e484c7e8f929a592971a7f296e8ce2.tar.gz
ci: Run test coverage for MSYS2 job
-rw-r--r--.gitlab-ci.yml3
-rwxr-xr-x.gitlab-ci/test-msys2.sh6
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f5e1ac96..5939bf885 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,10 +125,13 @@ msys2-mingw32:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
artifacts:
+ reports:
+ junit: "_build/%CI_JOB_NAME%-report.xml"
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
when: always
paths:
- _build/meson-logs
+ - "_build/%CI_JOB_NAME%-report.xml"
- _coverage/
vs2017-x64:
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 4cb710857..e426f5d5f 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -53,6 +53,12 @@ ninja
# FIXME: fix the test suite
meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true
+python3 "${DIR}"/.gitlab-ci/meson-junit-report.py \
+ --project-name glib \
+ --job-id "${CI_JOB_NAME}" \
+ --output "${DIR}/_build/${CI_JOB_NAME}-report.xml" \
+ "${DIR}/_build/meson-logs/testlog.json"
+
"${LCOV}" \
--quiet \
--config-file "${DIR}"/.gitlab-ci/lcovrc \