mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-12 18:53:07 +02:00
ci: Set CFLAGS on msys2-mingw32 in yaml file as it happens for other jobs
Be consistent, and based on this also perform the lcov job or not
This commit is contained in:
parent
e2560d1681
commit
fdaa8a334a
@ -303,6 +303,7 @@ msys2-mingw32:
|
|||||||
variables:
|
variables:
|
||||||
MSYSTEM: "MINGW32"
|
MSYSTEM: "MINGW32"
|
||||||
CHERE_INVOKING: "yes"
|
CHERE_INVOKING: "yes"
|
||||||
|
CFLAGS: -coverage -ftest-coverage -fprofile-arcs
|
||||||
script:
|
script:
|
||||||
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
|
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
|
||||||
- C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
|
- C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
|
||||||
|
@ -34,7 +34,6 @@ export CCACHE_BASEDIR CCACHE_DIR
|
|||||||
pip3 install --upgrade --user meson==0.60.3
|
pip3 install --upgrade --user meson==0.60.3
|
||||||
|
|
||||||
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
|
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
|
||||||
CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
|
|
||||||
DIR="$(pwd)"
|
DIR="$(pwd)"
|
||||||
export PATH CFLAGS
|
export PATH CFLAGS
|
||||||
|
|
||||||
@ -42,6 +41,7 @@ meson --werror --buildtype debug _build
|
|||||||
cd _build
|
cd _build
|
||||||
ninja
|
ninja
|
||||||
|
|
||||||
|
if [[ "$CFLAGS" == *"-coverage"* ]]; then
|
||||||
lcov \
|
lcov \
|
||||||
--quiet \
|
--quiet \
|
||||||
--config-file "${DIR}"/.lcovrc \
|
--config-file "${DIR}"/.lcovrc \
|
||||||
@ -49,13 +49,16 @@ lcov \
|
|||||||
--capture \
|
--capture \
|
||||||
--initial \
|
--initial \
|
||||||
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
|
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
|
||||||
|
fi
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
|
if [[ "$CFLAGS" == *"-coverage"* ]]; then
|
||||||
lcov \
|
lcov \
|
||||||
--quiet \
|
--quiet \
|
||||||
--config-file "${DIR}"/.lcovrc \
|
--config-file "${DIR}"/.lcovrc \
|
||||||
--directory "${DIR}/_build" \
|
--directory "${DIR}/_build" \
|
||||||
--capture \
|
--capture \
|
||||||
--output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"
|
--output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"
|
||||||
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user