[glib: 1/2] Revert "tests: Deactivate tls-bindings test suite for windows"




commit e02b905b4b6e1e8638ffcff3ebeb71b6afe2c6d8
Author: Philip Withnall <pwithnall endlessos org>
Date:   Thu Jun 3 13:01:29 2021 +0100

    Revert "tests: Deactivate tls-bindings test suite for windows"
    
    This reverts commit 7f2fef5c2691210444a08b2998b003e56b4d59f3.
    
    There have been some changes to the gitlab-ci-win32-runner pre-clone
    script which should be more successful at killing the remaining
    processes after this test. See
    https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2008#note_1127126

 gio/tests/meson.build | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 848202efd..a926ae01a 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -93,18 +93,11 @@ gio_tests = {
   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
+  'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
   'gdbus-address-get-session' : {},
   'win32-appinfo' : {},
 }
 
-# FIXME: These sometimes can’t be killed on the Windows CI machines, and cause
-# all subsequent CI runs on Windows to fail. See #2297.
-if host_machine.system() != 'windows'
-  gio_tests += {
-    'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']}
-  }
-endif
-
 test_extra_programs = {
   'gdbus-connection-flush-helper' : {},
   'gdbus-testserver' : {},


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