[glib/wip/3v1n0/support-can-fail-tests: 4/7] ci: Mark failing windows tests as can-fail and do not ignore test failures




commit 8b586b39c1565dd64cbe1bcef1d42334d8d63988
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Wed Oct 19 21:34:48 2022 +0200

    ci: Mark failing windows tests as can-fail and do not ignore test failures

 .gitlab-ci/test-msvc.bat  | 3 +--
 gio/tests/meson.build     | 4 +++-
 glib/tests/meson.build    | 9 +++++++--
 gmodule/tests/meson.build | 2 ++
 gobject/tests/meson.build | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 6dcfebfcca..1871c37724 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -17,8 +17,7 @@ meson %args% _build || goto :error
 python .gitlab-ci/check-missing-install-tag.py _build || goto :error
 ninja -C _build || goto :error
 
-:: FIXME: dont ignore test errors
-meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER%
+meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error
 meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=flaky_tests --suite=flaky
 
 :: FIXME: can we get code coverage support?
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index ceb6ba70bf..b219172780 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -75,6 +75,7 @@ gio_tests = {
   'g-file-info' : {
     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
     'should_fail' : host_system == 'darwin',
+    'can_fail' : host_system == 'windows',
   },
   'g-icon' : {},
   'gdbus-addresses' : {},
@@ -84,6 +85,7 @@ gio_tests = {
     'install_rpath' : installed_tests_execdir,
     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
     'should_fail' : host_system == 'darwin',
+    'can_fail' : host_system == 'windows',
   },
   'inet-address' : {},
   'io-stream' : {},
@@ -115,7 +117,7 @@ gio_tests = {
   'vfs' : {},
   'volumemonitor' : {},
   'glistmodel' : {},
-  'testfilemonitor' : {'suite' : ['slow', 'flaky']},
+  'testfilemonitor' : {'suite' : ['slow', 'flaky'], 'can_fail': host_system == 'windows' },
   'thumbnail-verification' : {},
   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 10462ba69e..24dca657f3 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -29,6 +29,7 @@ glib_tests = {
   'fileutils' : {},
   'gdatetime' : {
     'suite' : ['slow'],
+    'can_fail' : host_system == 'windows',
   },
   'guuid' : {},
   'gvariant' : {
@@ -110,7 +111,9 @@ glib_tests = {
   'slice-eager-freeing' : {},
   'slist' : {},
   'sort' : {},
-  'spawn-multithreaded' : {},
+  'spawn-multithreaded' : {
+    'can_fail': glib_static_build and host_system == 'windows',
+  },
   'spawn-path-search' : {},
   'spawn-singlethread' : {
     'dependencies' : [winsock2],
@@ -318,7 +321,9 @@ if installed_tests_enabled
 endif
 
 python_tests = {
-  'assert-msg-test.py' : {},
+  'assert-msg-test.py' : {
+    'can_fail' : host_system == 'windows',
+  },
 }
 
 executable('assert-msg-test', ['assert-msg-test.c'],
diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build
index 55a45ad603..fda05bdc5f 100644
--- a/gmodule/tests/meson.build
+++ b/gmodule/tests/meson.build
@@ -3,11 +3,13 @@ gmodule_tests = {
     'export_dynamic' : true,
     'source': 'module-test.c',
     'c_args': ['-DMODULE_TYPE="library"'],
+    'can_fail': glib_static_build and host_system == 'windows',
   },
   'module-test-plugin' : {
     'export_dynamic' : true,
     'source': 'module-test.c',
     'c_args': ['-DMODULE_TYPE="plugin"'],
+    'can_fail': glib_static_build and host_system == 'windows',
   },
 }
 
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index fba5c2e214..da8e35ebea 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -124,7 +124,9 @@ endif
 
 python_tests = {
   'genmarshal.py' : {},
-  'gobject-query.py' : {},
+  'gobject-query.py' : {
+    'can_fail' : host_system == 'windows',
+  },
   'mkenums.py' : {},
 }
 


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