diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-06-04 05:48:40 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-06-04 05:48:40 +0000 |
| commit | e4ae836d40df83c7a901e67a6a18d68c70622524 (patch) | |
| tree | 6a10f44a66a1ee831c636b753493fe232dd03d6c | |
| parent | 1dfef5df6a342606d4b41d820a13ffbce1cc2481 (diff) | |
| parent | 97376f95bfeb4a2a265707ceb96490e0ebe0524a (diff) | |
| download | glib-e4ae836d40df83c7a901e67a6a18d68c70622524.tar.gz | |
Merge branch 'backport-875-ci-win32-glib-2-60' into 'glib-2-60'
Backport !875 “CI/msys2: disable coverage reporting, lcov doesn't support gcc9 yet” to glib-2-60
See merge request GNOME/glib!886
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 4cb710857..c3f3bcd1b 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -42,20 +42,23 @@ meson --werror --buildtype debug _build cd _build ninja -"${LCOV}" \ - --quiet \ - --config-file "${DIR}"/.gitlab-ci/lcovrc \ - --directory "${DIR}/_build" \ - --capture \ - --initial \ - --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" +# 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" # FIXME: fix the test suite meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true -"${LCOV}" \ - --quiet \ - --config-file "${DIR}"/.gitlab-ci/lcovrc \ - --directory "${DIR}/_build" \ - --capture \ - --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov" +# FIXME: see above +#"${LCOV}" \ +# --quiet \ +# --config-file "${DIR}"/.gitlab-ci/lcovrc \ +# --directory "${DIR}/_build" \ +# --capture \ +# --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov" |