[glib/wip/3v1n0/support-can-fail-tests: 2/8] tests: Mark should_fail tests as can_fail




commit 3978476ab735cde0e274b123d429173fbd489a00
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Wed Oct 19 23:52:13 2022 +0200

    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  | 15 +++++++--------
 glib/tests/meson.build |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 3532aff559..8a2b233d6a 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' : {},
@@ -68,7 +68,7 @@ gio_tests = {
   'filter-streams' : {},
   'giomodule' : {
     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-    'should_fail' : host_system == 'darwin',
+    'can_fail' : host_system == 'darwin',
   },
   'gsubprocess' : {},
   'g-file' : {},
@@ -84,8 +84,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' : {},
@@ -108,7 +107,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' : {},
@@ -126,7 +125,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' : {},
 }
@@ -866,7 +865,7 @@ if meson.can_run_host_binaries()
     'resources' : {
       'extra_sources' : resources_extra_sources,
       # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-      'should_fail' : host_system == 'darwin',
+      'can_fail' : host_system == 'darwin',
     },
   }
 endif
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 8acf299c7e..681882cd1d 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' : {},


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]