diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-19 21:34:48 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-31 14:08:31 +0100 |
| commit | 8d5ae3ae83091363e459c1de31fe8426734ff8ee (patch) | |
| tree | 2add20eab6c10b70aa23899a67aca1f5aa95472b | |
| parent | 54a9e797fea796cd8597d4bd0de6f3c82d080640 (diff) | |
| download | glib-8d5ae3ae83091363e459c1de31fe8426734ff8ee.tar.gz | |
ci: Mark failing mingw tests as can-fail and do not ignore test failures
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 3 | ||||
| -rw-r--r-- | gio/tests/meson.build | 2 | ||||
| -rw-r--r-- | glib/tests/meson.build | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 43708636a..5f9dcbd91 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -50,8 +50,7 @@ lcov \ --initial \ --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" -# FIXME: fix the test suite -meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" || true +meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ --setup=unstable_tests --suite=failing --suite=flaky || true diff --git a/gio/tests/meson.build b/gio/tests/meson.build index f6d6a020a..da56da886 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -70,7 +70,7 @@ gio_tests = { 'gsubprocess' : {}, 'g-file' : {}, 'g-file-info' : { - 'can_fail' : host_system == 'windows', + 'can_fail' : host_system == 'windows' and cc.get_id() != 'gcc', }, 'g-icon' : {}, 'gdbus-addresses' : {}, diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 42abc9860..db4684348 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -119,7 +119,9 @@ glib_tests = { 'spawn-singlethread' : { 'dependencies' : [winsock2], }, - 'spawn-test' : {}, + 'spawn-test' : { + 'can_fail': host_system == 'windows' and cc.get_id() == 'gcc', + }, 'strfuncs' : {}, 'string' : {}, 'strvbuilder' : {}, |