diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index e426f5d5f..25a7a1297 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -24,10 +24,10 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-zlib \ mingw-w64-$MSYS2_ARCH-libelf -curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz" -echo "44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23 lcov-1.13.tar.gz" | sha256sum -c -tar -xzf lcov-1.13.tar.gz -LCOV="$(pwd)/lcov-1.13/bin/lcov" +curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz" +echo "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a lcov-1.14.tar.gz" | sha256sum -c +tar -xzf lcov-1.14.tar.gz +LCOV="$(pwd)/lcov-1.14/bin/lcov" mkdir -p _coverage mkdir -p _ccache @@ -42,13 +42,15 @@ 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 @@ -59,9 +61,10 @@ python3 "${DIR}"/.gitlab-ci/meson-junit-report.py \ --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" +# FIXME: see above +#"${LCOV}" \ +# --quiet \ +# --config-file "${DIR}"/.gitlab-ci/lcovrc \ +# --directory "${DIR}/_build" \ +# --capture \ +# --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"