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




commit 5d7703526b5a18e608c663bd5257dbc330b70be0
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     | 2 ++
 glib/tests/meson.build    | 9 +++++++--
 gmodule/tests/meson.build | 7 +++++--
 gobject/tests/meson.build | 4 +++-
 5 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 524b6be303..c5d64fa362 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=unstable_tests 
--suite=failing --suite=flaky
 
 :: FIXME: can we get code coverage support?
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index f547c79e64..8c1f7a9e79 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' : {},
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 981eea459d..ac514d23e7 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 c7aa8058d5..0b0c6a8c12 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',
   },
 }
 
@@ -93,11 +95,12 @@ foreach test_name, extra_args : gmodule_tests
     install: install,
   )
 
+  suite = ['gmodule'] + extra_args.get('suite', [])
+  timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
+
   if extra_args.get('can_fail', false)
     suite += 'failing'
   endif
 
-  suite = ['gmodule'] + extra_args.get('suite', [])
-  timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
   test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
 endforeach
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 8ae1bf652e..ce9e229b62 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]