ci: Use verbose output in meson by default

Now that we're using TAP parsing, this will show subtest failures in
details but without showing any logging error, that we'd still need to parse
from actual logs.
This commit is contained in:
Marco Trevisan (Treviño) 2023-01-20 15:41:17 +01:00
parent a707cebcd9
commit a8f56c5be1
3 changed files with 6 additions and 6 deletions

View File

@ -4,13 +4,13 @@ set -ex
./.gitlab-ci/check-missing-install-tag.py _build ./.gitlab-ci/check-missing-install-tag.py _build
meson test \ meson test -v \
-C _build \ -C _build \
--timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
"$@" "$@"
# Run only the flaky tests, so we can log the failures but without hard failing # Run only the flaky tests, so we can log the failures but without hard failing
meson test \ meson test -v \
-C _build \ -C _build \
--timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
"$@" --setup=unstable_tests --suite=failing --suite=flaky || true "$@" --setup=unstable_tests --suite=failing --suite=flaky || true

View File

@ -17,8 +17,8 @@ meson %args% _build || goto :error
python .gitlab-ci/check-missing-install-tag.py _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error
ninja -C _build || goto :error ninja -C _build || goto :error
meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error
meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky
:: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894 :: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894
python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" || goto :error python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" || goto :error

View File

@ -54,8 +54,8 @@ if [[ "$CFLAGS" == *"-coverage"* ]]; then
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
fi fi
meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
--setup=unstable_tests --suite=failing --suite=flaky || true --setup=unstable_tests --suite=failing --suite=flaky || true
if [[ "$CFLAGS" == *"-coverage"* ]]; then if [[ "$CFLAGS" == *"-coverage"* ]]; then