Merge branch 'ci-msys2-update-lcov' into 'master'

CI/msys2: disable coverage reporting, lcov doesn't support gcc9 yet

See merge request GNOME/glib!875
This commit is contained in:
Philip Withnall 2019-05-30 09:31:55 +00:00
commit c53342c4a1

View File

@ -24,10 +24,10 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-zlib \ mingw-w64-$MSYS2_ARCH-zlib \
mingw-w64-$MSYS2_ARCH-libelf 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" curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz"
echo "44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23 lcov-1.13.tar.gz" | sha256sum -c echo "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a lcov-1.14.tar.gz" | sha256sum -c
tar -xzf lcov-1.13.tar.gz tar -xzf lcov-1.14.tar.gz
LCOV="$(pwd)/lcov-1.13/bin/lcov" LCOV="$(pwd)/lcov-1.14/bin/lcov"
mkdir -p _coverage mkdir -p _coverage
mkdir -p _ccache mkdir -p _ccache
@ -42,13 +42,15 @@ meson --werror --buildtype debug _build
cd _build cd _build
ninja ninja
"${LCOV}" \ # FIXME: lcov doesn't support gcc9 yet:
--quiet \ # https://github.com/linux-test-project/lcov/issues/58
--config-file "${DIR}"/.gitlab-ci/lcovrc \ #"${LCOV}" \
--directory "${DIR}/_build" \ # --quiet \
--capture \ # --config-file "${DIR}"/.gitlab-ci/lcovrc \
--initial \ # --directory "${DIR}/_build" \
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" # --capture \
# --initial \
# --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
# FIXME: fix the test suite # FIXME: fix the test suite
meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true 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" \ --output "${DIR}/_build/${CI_JOB_NAME}-report.xml" \
"${DIR}/_build/meson-logs/testlog.json" "${DIR}/_build/meson-logs/testlog.json"
"${LCOV}" \ # FIXME: see above
--quiet \ #"${LCOV}" \
--config-file "${DIR}"/.gitlab-ci/lcovrc \ # --quiet \
--directory "${DIR}/_build" \ # --config-file "${DIR}"/.gitlab-ci/lcovrc \
--capture \ # --directory "${DIR}/_build" \
--output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov" # --capture \
# --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"