Imported Upstream version 2.61.0

1 files changed, 19 insertions, 16 deletions

diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index c3f3bcd1b..e426f5d5f 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -42,23 +42,26 @@ meson --werror --buildtype debug _build
 cd _build
 ninja
 
-# FIXME: lcov doesn't support gcc9 yet:
-# https://github.com/linux-test-project/lcov/issues/58
-#"${LCOV}" \
-#    --quiet \
-#    --config-file "${DIR}"/.gitlab-ci/lcovrc \
-#    --directory "${DIR}/_build" \
-#    --capture \
-#    --initial \
-#    --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
+"${LCOV}" \
+    --quiet \
+    --config-file "${DIR}"/.gitlab-ci/lcovrc \
+    --directory "${DIR}/_build" \
+    --capture \
+    --initial \
+    --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
 
 # FIXME: fix the test suite
 meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true
 
-# FIXME: see above
-#"${LCOV}" \
-#    --quiet \
-#    --config-file "${DIR}"/.gitlab-ci/lcovrc \
-#    --directory "${DIR}/_build" \
-#    --capture \
-#    --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"
+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 \
+    --directory "${DIR}/_build" \
+    --capture \
+    --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"