Merge branch 'macos_ci' into 'main'

interim solution for macOS CI

See merge request GNOME/glib!3503
This commit is contained in:
Philip Withnall
2023-08-12 22:52:57 +00:00
2 changed files with 27 additions and 8 deletions

View File

@@ -80,7 +80,8 @@ gio_tests = {
},
'g-file' : {},
'g-file-info' : {
'can_fail' : host_system == 'windows' and cc.get_id() != 'gcc',
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3070
'can_fail' : host_system == 'darwin' or host_system == 'windows' and cc.get_id() != 'gcc',
},
'g-icon' : {},
'gdbus-addresses' : {},
@@ -281,7 +282,10 @@ if host_machine.system() != 'windows'
'unix-streams' : {},
'g-file-info-filesystem-readonly' : {},
'gschema-compile' : {'install' : false},
'trash' : {},
'trash' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3069
'can_fail' : host_system == 'darwin',
},
}
# LD_PRELOAD modules don't work so well with AddressSanitizer