luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-05 23:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'w32-skips' into 'main'

Browse Source 
Various win32 tests skip & fixes

See merge request GNOME/glib!2540
This commit is contained in:
Philip Withnall
2022-03-21 12:19:24 +00:00
parent 48a3e8f7f2 e38e92e37b
commit 2e940e125f
8 changed files with 100 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/tests/meson.build
View File

@@ -171,6 +171,14 @@ else
}
endif
have_dbus_daemon = find_program('dbus-daemon', required : false).found()
if have_dbus_daemon
gio_tests += {
'debugcontroller' : {},
'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]},
}
endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -244,8 +252,6 @@ if host_machine.system() != 'windows'
}
endif
# Test programs that need to bring up a session bus (requires dbus-daemon)
have_dbus_daemon = find_program('dbus-daemon', required : false).found()
if have_dbus_daemon
annotate_args = [
'--annotate', 'org.project.Bar', 'Key1', 'Value1',
@@ -318,8 +324,6 @@ if host_machine.system() != 'windows'
'extra_sources' : extra_sources,
'suite' : ['slow'],
},
'debugcontroller' : {},
'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]},
'gdbus-auth' : {'extra_sources' : extra_sources},
'gdbus-bz627724' : {'extra_sources' : extra_sources},
'gdbus-close-pending' : {'extra_sources' : extra_sources},