Merge branch 'try-tls-binding-tests-again' into 'main'

Revert "tests: Deactivate tls-bindings test suite for windows"

See merge request GNOME/glib!2130
This commit is contained in:
Philip Withnall 2021-06-10 12:46:12 +00:00
commit de74a70b7e

View File

@ -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 cant 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' : {},