[glib/wip/3v1n0/support-can-fail-tests: 1/8] ci: Mark failing mingw tests as can-fail and do not ignore test failures
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/3v1n0/support-can-fail-tests: 1/8] ci: Mark failing mingw tests as can-fail and do not ignore test failures
- Date: Thu, 20 Oct 2022 03:08:56 +0000 (UTC)
commit 15ffb20c428f08f0aa262f9afde56420d5e61bea
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Wed Oct 19 21:34:48 2022 +0200
ci: Mark failing mingw tests as can-fail and do not ignore test failures
.gitlab-ci/test-msys2.sh | 3 +--
gio/tests/meson.build | 4 ++--
glib/tests/meson.build | 4 +++-
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 43708636a5..5f9dcbd918 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 8c1f7a9e79..3532aff559 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -74,8 +74,8 @@ gio_tests = {
'g-file' : {},
'g-file-info' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
- 'can_fail' : host_system == 'windows',
+ 'can_fail' : (host_system == 'darwin' or
+ 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 ac514d23e7..8acf299c7e 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -118,7 +118,9 @@ glib_tests = {
'spawn-singlethread' : {
'dependencies' : [winsock2],
},
- 'spawn-test' : {},
+ 'spawn-test' : {
+ 'can_fail': host_system == 'windows' and cc.get_id() == 'gcc',
+ },
'strfuncs' : {},
'string' : {},
'strvbuilder' : {},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]