diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-03-23 11:30:16 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-03-23 11:30:16 +0000 |
| commit | 0d8799b44b1d1f370642273fa135c64f2b4c48ea (patch) | |
| tree | 2812bf4781eaa3dd18e45ac097f5db3647b13666 | |
| parent | 01d1aaeb2744b6c4191a2a72d8e43c7c88aa7551 (diff) | |
| parent | 7f2fef5c2691210444a08b2998b003e56b4d59f3 (diff) | |
| download | glib-0d8799b44b1d1f370642273fa135c64f2b4c48ea.tar.gz | |
Merge branch 'tls-bindings-ci-failure' into 'master'
tests: Deactivate tls-bindings test suite for windows
See merge request GNOME/glib!2008
| -rw-r--r-- | gio/tests/meson.build | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae01a..848202efd 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -93,11 +93,18 @@ 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' : {}, |