diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2023-01-20 15:41:17 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2023-01-20 15:41:17 +0100 |
| commit | a8f56c5be1d36bc5f0aa74e54e45d3e778cdc05e (patch) | |
| tree | f4ee1f6ff4f3c0f45d784d995978e8eba5f42ef9 | |
| parent | a707cebcd9182386af206678a6000fffe8d169bd (diff) | |
| download | glib-a8f56c5be1d36bc5f0aa74e54e45d3e778cdc05e.tar.gz | |
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.
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 4 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index 461f31f6e..1189493ba 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -4,13 +4,13 @@ set -ex ./.gitlab-ci/check-missing-install-tag.py _build -meson test \ +meson test -v \ -C _build \ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ "$@" # Run only the flaky tests, so we can log the failures but without hard failing -meson test \ +meson test -v \ -C _build \ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ "$@" --setup=unstable_tests --suite=failing --suite=flaky || true diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 48b5668d5..60a62ff76 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -17,8 +17,8 @@ meson %args% _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error ninja -C _build || goto :error -meson test -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% || goto :error +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 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 diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 8b24c243d..d253007dd 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -54,8 +54,8 @@ if [[ "$CFLAGS" == *"-coverage"* ]]; then --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" fi -meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" -meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ +meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" +meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ --setup=unstable_tests --suite=failing --suite=flaky || true if [[ "$CFLAGS" == *"-coverage"* ]]; then |