From b30430970ac97752b31909cf3d0281f06eed4db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 19 Oct 2022 23:52:13 +0200 Subject: [PATCH] tests: Mark should_fail tests as can_fail Even if they are expected to fail, we should not use an inverse logic for treating their return codes. --- gio/tests/meson.build | 11 +++++------ glib/tests/meson.build | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index da56da886..c3e9c6258 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -46,7 +46,7 @@ giotypefuncs_inc = custom_target( gio_tests = { 'appmonitor' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'async-close-output-stream' : {}, 'async-splice-output-stream' : {}, @@ -56,7 +56,7 @@ gio_tests = { 'contexts' : {}, 'contenttype' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'converter-stream' : {}, 'credentials' : {}, @@ -79,8 +79,7 @@ gio_tests = { 'dependencies' : [libgdbus_example_objectmanager_dep], 'install_rpath' : installed_tests_execdir, # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', - 'can_fail' : host_system == 'windows', + 'can_fail' : host_system in ['darwin', 'windows'], }, 'inet-address' : {}, 'io-stream' : {}, @@ -104,7 +103,7 @@ gio_tests = { 'sleepy-stream' : {}, 'socket' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'socket-listener' : {}, 'socket-service' : {}, @@ -122,7 +121,7 @@ gio_tests = { 'unix-fd' : {}, 'gdbus-address-get-session' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'win32-appinfo' : {}, } diff --git a/glib/tests/meson.build b/glib/tests/meson.build index db4684348..81cb45fb3 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -18,12 +18,12 @@ glib_tests = { 'dataset' : {}, 'date' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'dir' : {}, 'environment' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'error' : {}, 'fileutils' : {},