mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-29 00:46:16 +01:00
2a605f6e15
Currently the code generated by gdbus-codegen uses G_DBUS_CALL_FLAGS_NONE in its D-Bus calls, which occur for each method defined by the input XML, and for proxy_set_property functions. This means that if the daemon which implements the methods checks for G_DBUS_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION and only does interactive authorization if that flag is present, users of the generated code have no way to cause the daemon to use interactive authorization (e.g. polkit dialogs). If we simply changed the generated code to always use G_DBUS_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION, its users would have no way to disallow interactive authorization (except for manually calling the D-Bus method themselves). So instead, this commit adds a GDBusCallFlags argument to method call functions. Since this is an API break which will require changes in projects using gdbus-codegen code, the change is conditional on the command line argument --glib-min-version having the value 2.64 or higher. The impetus for this change is that I'm changing accountsservice to properly respect G_DBUS_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION, and libaccountsservice uses generated code for D-Bus method calls. So these changes will allow libaccountsservice to continue allowing interactive authorization, and avoid breaking any users of it which expect that. See https://gitlab.freedesktop.org/accountsservice/accountsservice/merge_requests/46 It might make sense to also let GDBusCallFlags be specified for property set operations, but that is not needed in the case of accountsservice, and would require significant work and breaking API in multiple places. Similarly, the generated code currently hard codes -1 as the timeout value when calling g_dbus_proxy_call*(). Add a timeout_msec argument so the user of the generated code can specify the timeout as well. Also, test this new API. In gio/tests/codegen.py we test that the new arguments are generated if and only of --glib-min-version is used with a value greater than or equal to 2.64, and in gio/tests/meson.build we test that the generated code with the new API can be linked against. The test_unix_fd_list() test also needed modification to continue working now that we're using gdbus-test-codegen.c with code generated with --glib-min-version=2.64 in one test. Finally, update the docs for gdbus-codegen to explain the effect of using --glib-min-version 2.64, both from this commit and from "gdbus-codegen: Emit GUnixFDLists if an arg has type `h` w/ min-version".
826 lines
27 KiB
Meson
826 lines
27 KiB
Meson
common_gio_tests_deps = [
|
|
libglib_dep,
|
|
libgmodule_dep,
|
|
libgobject_dep,
|
|
libgio_dep,
|
|
]
|
|
|
|
test_c_args = [
|
|
'-DG_LOG_DOMAIN="GLib-GIO"',
|
|
'-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
|
|
'-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
|
|
'-UG_DISABLE_ASSERT',
|
|
]
|
|
|
|
if host_machine.system() == 'windows'
|
|
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
|
|
endif
|
|
|
|
subdir('gdbus-object-manager-example')
|
|
|
|
gengiotypefuncs_prog = find_program('gengiotypefuncs.py')
|
|
giotypefuncs_inc = custom_target(
|
|
'giotypefuncs.inc',
|
|
output : 'giotypefuncs.inc',
|
|
input : gio_headers + [gioenumtypes_h] + gobject_install_headers,
|
|
command: [gengiotypefuncs_prog, '@OUTPUT@', '@INPUT@'])
|
|
|
|
# Test programs buildable on all platforms
|
|
gio_tests = {
|
|
'appmonitor' : {},
|
|
'async-close-output-stream' : {},
|
|
'async-splice-output-stream' : {},
|
|
'buffered-input-stream' : {},
|
|
'buffered-output-stream' : {},
|
|
'cancellable' : {},
|
|
'contexts' : {},
|
|
'contenttype' : {},
|
|
'converter-stream' : {},
|
|
'credentials' : {},
|
|
'data-input-stream' : {},
|
|
'data-output-stream' : {},
|
|
'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]},
|
|
'fileattributematcher' : {},
|
|
'filter-streams' : {},
|
|
'giomodule' : {},
|
|
'gsubprocess' : {},
|
|
'g-file' : {},
|
|
'g-file-info' : {},
|
|
'g-icon' : {},
|
|
'gdbus-addresses' : {},
|
|
'gdbus-message' : {},
|
|
'inet-address' : {},
|
|
'io-stream' : {},
|
|
'memory-input-stream' : {},
|
|
'memory-monitor' : {},
|
|
'memory-output-stream' : {},
|
|
'mount-operation' : {},
|
|
'network-address' : {'extra_sources': ['mock-resolver.c']},
|
|
'network-monitor' : {},
|
|
'network-monitor-race' : {},
|
|
'permission' : {},
|
|
'pollable' : {},
|
|
'proxy-test' : {},
|
|
'readwrite' : {},
|
|
'simple-async-result' : {},
|
|
'simple-proxy' : {},
|
|
'sleepy-stream' : {},
|
|
'socket' : {},
|
|
'socket-listener' : {},
|
|
'socket-service' : {},
|
|
'srvtarget' : {},
|
|
'task' : {},
|
|
'vfs' : {},
|
|
'volumemonitor' : {},
|
|
'glistmodel' : {},
|
|
'testfilemonitor' : {'suite' : ['slow', 'flaky']},
|
|
'thumbnail-verification' : {},
|
|
'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
|
|
'gdbus-address-get-session' : {},
|
|
}
|
|
|
|
test_extra_programs = {
|
|
'gdbus-connection-flush-helper' : {},
|
|
'gdbus-testserver' : {},
|
|
'gsubprocess-testprog' : {},
|
|
}
|
|
|
|
python_tests = [
|
|
'codegen.py',
|
|
]
|
|
|
|
test_env = environment()
|
|
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
|
|
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
|
|
test_env.set('GIO_MODULE_DIR', '')
|
|
test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop')
|
|
|
|
# Check for libdbus1 - Optional - is only used in the GDBus test cases
|
|
# 1.2.14 required for dbus_message_set_serial
|
|
dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14')
|
|
if not dbus1_dep.found()
|
|
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
|
|
# MSVC: Search for the DBus library by the configuration, which corresponds
|
|
# to the output of CMake builds of DBus. Note that debugoptimized
|
|
# is really a Release build with .PDB files.
|
|
if buildtype == 'debug'
|
|
dbus1_dep = cc.find_library('dbus-1d', required : false)
|
|
else
|
|
dbus1_dep = cc.find_library('dbus-1', required : false)
|
|
endif
|
|
endif
|
|
endif
|
|
if dbus1_dep.found()
|
|
glib_conf.set('HAVE_DBUS1', 1)
|
|
|
|
gio_tests += {
|
|
'gdbus-serialization' : {
|
|
'extra_sources' : ['gdbus-tests.c'],
|
|
'dependencies' : [dbus1_dep],
|
|
},
|
|
'gdbus-server-auth' : {
|
|
'dependencies' : [dbus1_dep],
|
|
},
|
|
}
|
|
else
|
|
# We can build a cut-down version of this test without libdbus
|
|
gio_tests += {
|
|
'gdbus-server-auth' : {},
|
|
}
|
|
endif
|
|
|
|
# Test programs buildable on UNIX only
|
|
if host_machine.system() != 'windows'
|
|
gio_tests += {
|
|
'file' : {},
|
|
'gdbus-peer' : {
|
|
'dependencies' : [libgdbus_example_objectmanager_dep],
|
|
'install_rpath' : installed_tests_execdir
|
|
},
|
|
'gdbus-peer-object-manager' : {},
|
|
'live-g-file' : {},
|
|
'socket-address' : {},
|
|
'stream-rw_all' : {},
|
|
'unix-fd' : {},
|
|
'unix-mounts' : {},
|
|
'unix-streams' : {},
|
|
'g-file-info-filesystem-readonly' : {},
|
|
'gschema-compile' : {'install' : false},
|
|
'trash' : {},
|
|
}
|
|
|
|
if have_rtld_next
|
|
gio_tests += {
|
|
'gsocketclient-slow' : {
|
|
'depends' : [
|
|
shared_library('slow-connect-preload',
|
|
'slow-connect-preload.c',
|
|
name_prefix : '',
|
|
dependencies: libdl_dep,
|
|
install_dir : installed_tests_execdir,
|
|
install: installed_tests_enabled,
|
|
)
|
|
],
|
|
'env' : {
|
|
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(meson.current_build_dir())
|
|
},
|
|
'installed_tests_env' : {
|
|
'LD_PRELOAD': '@0@/slow-connect-preload.so'.format(installed_tests_execdir),
|
|
},
|
|
},
|
|
}
|
|
endif
|
|
|
|
# Uninstalled because of the check-for-executable logic in DesktopAppInfo
|
|
# unable to find the installed executable
|
|
if not glib_have_cocoa
|
|
gio_tests += {
|
|
'appinfo' : {
|
|
'install' : false,
|
|
},
|
|
'desktop-app-info' : {
|
|
'install' : false,
|
|
},
|
|
}
|
|
endif
|
|
|
|
test_extra_programs += {
|
|
'basic-application' : {},
|
|
'dbus-launch' : {},
|
|
'appinfo-test' : {},
|
|
}
|
|
|
|
if not glib_have_cocoa
|
|
test_extra_programs += {
|
|
'apps' : {},
|
|
}
|
|
gio_tests += {
|
|
'mimeapps' : {},
|
|
}
|
|
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',
|
|
'--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
|
|
'--annotate', 'org.project.Bar.HelloWorld()', 'Key3', 'Value3',
|
|
'--annotate', 'org.project.Bar::TestSignal', 'Key4', 'Value4',
|
|
'--annotate', 'org.project.Bar:ay', 'Key5', 'Value5',
|
|
'--annotate', 'org.project.Bar.TestPrimitiveTypes()[val_int32]', 'Key6', 'Value6',
|
|
'--annotate', 'org.project.Bar.TestPrimitiveTypes()[ret_uint32]', 'Key7', 'Value7',
|
|
'--annotate', 'org.project.Bar::TestSignal[array_of_strings]', 'Key8', 'Value8',
|
|
]
|
|
# Generate gdbus-test-codegen-generated.{c,h}
|
|
gdbus_test_codegen_generated = custom_target('gdbus-test-codegen-generated',
|
|
input : ['test-codegen.xml'],
|
|
output : ['gdbus-test-codegen-generated.h',
|
|
'gdbus-test-codegen-generated.c'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
command : [python, gdbus_codegen,
|
|
'--interface-prefix', 'org.project.',
|
|
'--output-directory', '@OUTDIR@',
|
|
'--generate-c-code', 'gdbus-test-codegen-generated',
|
|
'--c-generate-object-manager',
|
|
'--c-generate-autocleanup', 'all',
|
|
'--c-namespace', 'Foo_iGen',
|
|
'--generate-docbook', 'gdbus-test-codegen-generated-doc',
|
|
annotate_args,
|
|
'@INPUT@'])
|
|
# Generate gdbus-test-codegen-generated-min-version-2-64.{c,h}
|
|
gdbus_test_codegen_generated_min_version_2_64 = custom_target('gdbus-test-codegen-generated-min-version-2-64',
|
|
input : ['test-codegen.xml'],
|
|
output : ['gdbus-test-codegen-generated-min-version-2-64.h',
|
|
'gdbus-test-codegen-generated-min-version-2-64.c'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
command : [python, gdbus_codegen,
|
|
'--glib-min-version', '2.64',
|
|
'--interface-prefix', 'org.project.',
|
|
'--output-directory', '@OUTDIR@',
|
|
'--generate-c-code', 'gdbus-test-codegen-generated-min-version-2-64',
|
|
'--c-generate-object-manager',
|
|
'--c-generate-autocleanup', 'all',
|
|
'--c-namespace', 'Foo_iGen',
|
|
'--generate-docbook', 'gdbus-test-codegen-generated-doc',
|
|
annotate_args,
|
|
'@INPUT@'])
|
|
gdbus_test_codegen_generated_interface_info = [
|
|
custom_target('gdbus-test-codegen-generated-interface-info-h',
|
|
input : ['test-codegen.xml'],
|
|
output : ['gdbus-test-codegen-generated-interface-info.h'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
command : [python, gdbus_codegen,
|
|
'--interface-info-header',
|
|
annotate_args,
|
|
'--output', '@OUTPUT@',
|
|
'@INPUT@']),
|
|
custom_target('gdbus-test-codegen-generated-interface-info-c',
|
|
input : ['test-codegen.xml'],
|
|
output : ['gdbus-test-codegen-generated-interface-info.c'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
command : [python, gdbus_codegen,
|
|
'--interface-info-body',
|
|
annotate_args,
|
|
'--output', '@OUTPUT@',
|
|
'@INPUT@']),
|
|
]
|
|
|
|
extra_sources = ['gdbus-sessionbus.c', 'gdbus-tests.c']
|
|
|
|
gio_tests += {
|
|
'actions' : {
|
|
'extra_sources' : extra_sources,
|
|
'suite' : ['slow'],
|
|
},
|
|
'gdbus-auth' : {'extra_sources' : extra_sources},
|
|
'gdbus-bz627724' : {'extra_sources' : extra_sources},
|
|
'gdbus-close-pending' : {'extra_sources' : extra_sources},
|
|
'gdbus-connection' : {'extra_sources' : extra_sources},
|
|
'gdbus-connection-loss' : {'extra_sources' : extra_sources},
|
|
'gdbus-connection-slow' : {'extra_sources' : extra_sources},
|
|
'gdbus-error' : {'extra_sources' : extra_sources},
|
|
'gdbus-exit-on-close' : {'extra_sources' : extra_sources},
|
|
'gdbus-export' : {
|
|
'extra_sources' : extra_sources,
|
|
'suite' : ['slow'],
|
|
},
|
|
'gdbus-introspection' : {'extra_sources' : extra_sources},
|
|
'gdbus-names' : {'extra_sources' : extra_sources},
|
|
'gdbus-proxy' : {'extra_sources' : extra_sources},
|
|
'gdbus-proxy-threads' : {
|
|
'extra_sources' : extra_sources,
|
|
'dependencies' : [dbus1_dep],
|
|
},
|
|
'gdbus-proxy-unique-name' : {'extra_sources' : extra_sources},
|
|
'gdbus-proxy-well-known-name' : {'extra_sources' : extra_sources},
|
|
'gdbus-test-codegen' : {
|
|
'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info],
|
|
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'],
|
|
},
|
|
'gdbus-threading' : {
|
|
'extra_sources' : extra_sources,
|
|
'suite' : ['slow', 'flaky'],
|
|
},
|
|
'gmenumodel' : {
|
|
'extra_sources' : extra_sources,
|
|
'suite' : ['slow'],
|
|
},
|
|
'gnotification' : {
|
|
'extra_sources' : [extra_sources, 'gnotification-server.c'],
|
|
},
|
|
'gdbus-test-codegen-old' : {
|
|
'source' : 'gdbus-test-codegen.c',
|
|
'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info],
|
|
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36',
|
|
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36'],
|
|
},
|
|
'gdbus-test-codegen-min-version-2-64' : {
|
|
'source' : 'gdbus-test-codegen.c',
|
|
'extra_sources' : [extra_sources, gdbus_test_codegen_generated_min_version_2_64, gdbus_test_codegen_generated_interface_info],
|
|
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_64'],
|
|
},
|
|
'gapplication' : {'extra_sources' : extra_sources},
|
|
}
|
|
|
|
if not glib_have_cocoa
|
|
gio_tests += {
|
|
'dbus-appinfo' : {
|
|
'extra_sources' : extra_sources,
|
|
},
|
|
}
|
|
endif
|
|
|
|
fake_document_portal_generated = custom_target('fake-document-portal-generated',
|
|
input : ['../org.freedesktop.portal.Documents.xml'],
|
|
output : ['fake-document-portal-generated.h',
|
|
'fake-document-portal-generated.c'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
command : [python, gdbus_codegen,
|
|
'--interface-prefix', 'org.freedesktop.portal.',
|
|
'--output-directory', '@OUTDIR@',
|
|
'--generate-c-code', 'fake-document-portal-generated',
|
|
'--c-namespace', 'Fake',
|
|
'@INPUT@'])
|
|
|
|
test_extra_programs += {
|
|
'fake-document-portal' : {
|
|
'extra_sources': fake_document_portal_generated,
|
|
},
|
|
}
|
|
endif # have_dbus_daemon
|
|
|
|
# This test is currently unreliable
|
|
executable('gdbus-overflow', 'gdbus-overflow.c',
|
|
c_args : test_c_args,
|
|
dependencies : common_gio_tests_deps,
|
|
install_dir : installed_tests_execdir,
|
|
install : installed_tests_enabled)
|
|
|
|
gio_tests += {
|
|
'gdbus-connection-flush' : {
|
|
'extra_sources' : ['test-io-stream.c', 'test-pipe-unix.c'],
|
|
},
|
|
'gdbus-non-socket' : {
|
|
'extra_sources' : ['gdbus-tests.c', 'test-io-stream.c', 'test-pipe-unix.c'],
|
|
},
|
|
}
|
|
|
|
# Generate test.mo from de.po using msgfmt
|
|
msgfmt = find_program('msgfmt', required : false)
|
|
if msgfmt.found()
|
|
subdir('de/LC_MESSAGES')
|
|
gio_tests += {
|
|
'gsettings' : {
|
|
'extra_sources' : [test_mo],
|
|
'c_args' : ['-DSRCDIR="@0@"'.format(meson.current_source_dir()),
|
|
'-DTEST_LOCALE_PATH="@0@"'.format(test_mo_dir)],
|
|
'install' : false,
|
|
},
|
|
}
|
|
endif
|
|
endif # unix
|
|
|
|
# Test programs buildable on Windows only
|
|
if host_machine.system() == 'windows'
|
|
gio_tests += {'win32-streams' : {}}
|
|
endif
|
|
|
|
if cc.get_id() != 'msvc'
|
|
gio_tests += {
|
|
'autoptr-gio' : {
|
|
'source' : 'autoptr.c',
|
|
},
|
|
}
|
|
endif
|
|
|
|
test_extra_programs += {
|
|
'gio-du' : {'install' : false},
|
|
'echo-server' : {'install' : false},
|
|
'filter-cat' : {'install' : false},
|
|
'gapplication-example-actions' : {'install' : false},
|
|
'gapplication-example-cmdline' : {'install' : false},
|
|
'gapplication-example-cmdline2' : {'install' : false},
|
|
'gapplication-example-cmdline3' : {'install' : false},
|
|
'gapplication-example-cmdline4' : {'install' : false},
|
|
'gapplication-example-dbushooks' : {'install' : false},
|
|
'gapplication-example-open' : {'install' : false},
|
|
'gdbus-daemon' : {
|
|
'extra_sources' : gdbus_daemon_sources,
|
|
'install' : false,
|
|
},
|
|
'gdbus-example-export' : {'install' : false},
|
|
'gdbus-example-own-name' : {'install' : false},
|
|
'gdbus-example-peer' : {'install' : false},
|
|
'gdbus-example-proxy-subclass' : {'install' : false},
|
|
'gdbus-example-server' : {'install' : false},
|
|
'gdbus-example-subtree' : {'install' : false},
|
|
'gdbus-example-watch-name' : {'install' : false},
|
|
'gdbus-example-watch-proxy' : {'install' : false},
|
|
'httpd' : {'install' : false},
|
|
'proxy' : {'install' : false},
|
|
'resolver' : {'install' : false},
|
|
'send-data' : {'install' : false},
|
|
'socket-server' : {'install' : false},
|
|
'socket-client' : {
|
|
'extra_sources' : ['gtlsconsoleinteraction.c'],
|
|
'install' : false,
|
|
},
|
|
}
|
|
|
|
if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
|
|
test_extra_programs += {
|
|
# These three are manual-run tests because they need a session bus but don't bring one up themselves
|
|
# FIXME: these build but don't seem to work!
|
|
'gdbus-example-objectmanager-client' : {
|
|
'dependencies' : [libgdbus_example_objectmanager_dep],
|
|
'install' : false,
|
|
},
|
|
'gdbus-example-objectmanager-server' : {
|
|
'dependencies' : [libgdbus_example_objectmanager_dep],
|
|
'install' : false,
|
|
},
|
|
'gdbus-test-fixture' : {
|
|
'dependencies' : [libgdbus_example_objectmanager_dep],
|
|
'install' : false,
|
|
},
|
|
}
|
|
endif
|
|
|
|
if host_machine.system() != 'windows'
|
|
test_extra_programs += {
|
|
'gdbus-example-unix-fd-client' : {
|
|
'install' : false,
|
|
},
|
|
}
|
|
endif
|
|
|
|
appinfo_test_desktop_files = [
|
|
'appinfo-test-gnome.desktop',
|
|
'appinfo-test-notgnome.desktop',
|
|
'appinfo-test.desktop',
|
|
'appinfo-test2.desktop',
|
|
]
|
|
|
|
cdata = configuration_data()
|
|
if installed_tests_enabled
|
|
cdata.set('installed_tests_dir', installed_tests_execdir)
|
|
else
|
|
cdata.set('installed_tests_dir', meson.current_build_dir())
|
|
endif
|
|
|
|
foreach appinfo_test_desktop_file : appinfo_test_desktop_files
|
|
if installed_tests_enabled
|
|
configure_file(
|
|
input: appinfo_test_desktop_file + '.in',
|
|
output: appinfo_test_desktop_file,
|
|
install_dir: installed_tests_execdir,
|
|
configuration: cdata,
|
|
)
|
|
else
|
|
configure_file(
|
|
input: appinfo_test_desktop_file + '.in',
|
|
output: appinfo_test_desktop_file,
|
|
configuration: cdata,
|
|
)
|
|
endif
|
|
endforeach
|
|
|
|
if installed_tests_enabled
|
|
install_data(
|
|
'contexts.c',
|
|
'g-icon.c',
|
|
'appinfo-test-actions.desktop',
|
|
'appinfo-test-static.desktop',
|
|
'file.c',
|
|
'org.gtk.test.dbusappinfo.desktop',
|
|
'org.gtk.test.dbusappinfo.flatpak.desktop',
|
|
'test1.overlay',
|
|
install_dir : installed_tests_execdir,
|
|
)
|
|
install_subdir('x-content', install_dir : installed_tests_execdir)
|
|
install_subdir('desktop-files', install_dir : installed_tests_execdir)
|
|
install_subdir('thumbnails', install_dir : installed_tests_execdir)
|
|
install_subdir('cert-tests', install_dir : installed_tests_execdir)
|
|
|
|
cdata = configuration_data()
|
|
cdata.set('installed_tests_dir', installed_tests_execdir)
|
|
cdata.set('program', 'static-link.py ' + glib_pkgconfigreldir)
|
|
configure_file(
|
|
input: installed_tests_template,
|
|
output: 'static-link.test',
|
|
install_dir: installed_tests_metadir,
|
|
configuration: cdata
|
|
)
|
|
install_subdir('static-link', install_dir : installed_tests_execdir)
|
|
install_data('static-link.py', install_dir : installed_tests_execdir)
|
|
endif
|
|
|
|
memory_monitor_tests = [
|
|
'memory-monitor-dbus',
|
|
'memory-monitor-portal',
|
|
]
|
|
|
|
foreach memory_monitor_test : memory_monitor_tests
|
|
cdata = configuration_data()
|
|
cdata.set('installed_tests_dir', installed_tests_execdir)
|
|
cdata.set('program', memory_monitor_test + '.py')
|
|
configure_file(
|
|
input: installed_tests_template,
|
|
output: memory_monitor_test + '.test',
|
|
install_dir: installed_tests_metadir,
|
|
configuration: cdata
|
|
)
|
|
cdata = configuration_data()
|
|
cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
|
|
configure_file(
|
|
input: memory_monitor_test + '.py.in',
|
|
output: memory_monitor_test + '.py',
|
|
install_dir : installed_tests_execdir,
|
|
configuration: cdata,
|
|
)
|
|
endforeach
|
|
|
|
if not meson.is_cross_build() or meson.has_exe_wrapper()
|
|
|
|
plugin_resources_c = custom_target('plugin-resources.c',
|
|
input : 'test4.gresource.xml',
|
|
output : 'plugin-resources.c',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--generate-source',
|
|
'--c-name', '_g_plugin',
|
|
'@INPUT@'])
|
|
|
|
shared_module('resourceplugin', 'resourceplugin.c', plugin_resources_c,
|
|
link_args : export_dynamic_ldflags,
|
|
dependencies : common_gio_tests_deps,
|
|
install_dir : installed_tests_execdir,
|
|
install : installed_tests_enabled
|
|
)
|
|
|
|
# referenced by test2.gresource.xml
|
|
big_test_resource = custom_target(
|
|
'gresource-big-test.txt',
|
|
input : ['gen-big-test-resource.py'],
|
|
output : ['gresource-big-test.txt'],
|
|
command : [python, '@INPUT0@', '@OUTPUT@'])
|
|
|
|
test_gresource = custom_target('test.gresource',
|
|
input : 'test.gresource.xml',
|
|
output : 'test.gresource',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--sourcedir=' + meson.current_build_dir(),
|
|
'@INPUT@'],
|
|
install_dir : installed_tests_execdir,
|
|
install : installed_tests_enabled)
|
|
|
|
test_resources2_c = custom_target('test_resources2.c',
|
|
input : 'test3.gresource.xml',
|
|
output : 'test_resources2.c',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--generate',
|
|
'--c-name', '_g_test2',
|
|
'--manual-register',
|
|
'@INPUT@'])
|
|
|
|
test_resources2_h = custom_target('test_resources2.h',
|
|
input : 'test3.gresource.xml',
|
|
output : 'test_resources2.h',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--generate',
|
|
'--c-name', '_g_test2',
|
|
'--manual-register',
|
|
'@INPUT@'])
|
|
|
|
test_resources_c = custom_target('test_resources.c',
|
|
input : 'test2.gresource.xml',
|
|
depends : big_test_resource,
|
|
output : 'test_resources.c',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--sourcedir=' + meson.current_build_dir(),
|
|
'--generate-source',
|
|
'--c-name', '_g_test1',
|
|
'@INPUT@'])
|
|
|
|
digit_test_resources_c = custom_target('digit_test_resources.c',
|
|
input : '111_digit_test.gresource.xml',
|
|
output : 'digit_test_resources.c',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--sourcedir=' + meson.current_build_dir(),
|
|
'--generate-source',
|
|
'--manual-register',
|
|
'@INPUT@'])
|
|
|
|
digit_test_resources_h = custom_target('digit_test_resources.h',
|
|
input : '111_digit_test.gresource.xml',
|
|
output : 'digit_test_resources.h',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--generate',
|
|
'--manual-register',
|
|
'@INPUT@'])
|
|
|
|
# referenced by test.gresource.xml
|
|
test_generated_txt = configure_file(input : 'test1.txt',
|
|
output : 'test-generated.txt',
|
|
copy : true,
|
|
)
|
|
|
|
resources_extra_sources = [
|
|
test_gresource,
|
|
test_resources_c,
|
|
test_resources2_c,
|
|
test_resources2_h,
|
|
digit_test_resources_c,
|
|
digit_test_resources_h,
|
|
]
|
|
|
|
# Create object file containing resource data for testing the --external-data
|
|
# option. Currently only GNU ld and GNU objcopy support the right options.
|
|
# Support for --add-symbol was added to LLVM objcopy in 2019
|
|
# (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
|
|
# LLVM once that support is in a stable release.
|
|
objcopy_supports_add_symbol = false
|
|
objcopy = find_program('objcopy', required : false)
|
|
if objcopy.found()
|
|
objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
|
|
endif
|
|
|
|
ld = find_program('ld', required : false)
|
|
|
|
if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
|
|
test_gresource_binary = custom_target('test5.gresource',
|
|
input : 'test5.gresource.xml',
|
|
output : 'test5.gresource',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--sourcedir=' + meson.current_build_dir(),
|
|
'@INPUT@'],
|
|
install_dir : installed_tests_execdir,
|
|
install : installed_tests_enabled)
|
|
|
|
# Create resource data file
|
|
test_resources_binary_c = custom_target('test_resources_binary.c',
|
|
input : 'test5.gresource.xml',
|
|
output : 'test_resources_binary.c',
|
|
command : [glib_compile_resources,
|
|
'--target=@OUTPUT@',
|
|
'--sourcedir=' + meson.current_source_dir(),
|
|
'--sourcedir=' + meson.current_build_dir(),
|
|
'--generate-source',
|
|
'--external-data',
|
|
'--c-name', '_g_binary_test1',
|
|
'@INPUT@'])
|
|
|
|
# Create object file containing resource data
|
|
test_resources_binary = custom_target('test_resources.o',
|
|
input : test_gresource_binary,
|
|
output : 'test_resources.o',
|
|
command : [ld,
|
|
'-r',
|
|
'-b','binary',
|
|
'@INPUT@',
|
|
'-o','@OUTPUT@'])
|
|
|
|
# Rename symbol to match the one in the C file
|
|
test_resources_binary2 = custom_target('test_resources2.o',
|
|
input : test_resources_binary,
|
|
output : 'test_resources2.o',
|
|
command : [objcopy,
|
|
'--add-symbol','_g_binary_test1_resource_data=.data:0',
|
|
'@INPUT@',
|
|
'@OUTPUT@'])
|
|
|
|
resources_extra_sources += [
|
|
test_resources_binary_c,
|
|
test_resources_binary2,
|
|
]
|
|
endif
|
|
|
|
gio_tests += {
|
|
'resources' : {
|
|
'extra_sources' : resources_extra_sources,
|
|
},
|
|
}
|
|
endif
|
|
|
|
foreach test_name, extra_args : gio_tests
|
|
source = extra_args.get('source', test_name + '.c')
|
|
extra_sources = extra_args.get('extra_sources', [])
|
|
install = installed_tests_enabled and extra_args.get('install', true)
|
|
installed_tests_env = extra_args.get('installed_tests_env', {})
|
|
|
|
if install
|
|
test_conf = configuration_data()
|
|
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
|
test_conf.set('program', test_name)
|
|
test_env_override = ''
|
|
if installed_tests_env != {}
|
|
envs = []
|
|
foreach var, value : installed_tests_env
|
|
envs += '@0@=@1@'.format(var, value)
|
|
endforeach
|
|
test_env_override = '@0@ @1@ '.format(env_program.path(), ' '.join(envs))
|
|
endif
|
|
test_conf.set('env', test_env_override)
|
|
configure_file(
|
|
input: installed_tests_template_tap,
|
|
output: test_name + '.test',
|
|
install_dir: installed_tests_metadir,
|
|
configuration: test_conf
|
|
)
|
|
endif
|
|
|
|
exe = executable(test_name, [source, extra_sources],
|
|
c_args : test_c_args + extra_args.get('c_args', []),
|
|
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
|
|
install_rpath : extra_args.get('install_rpath', ''),
|
|
install_dir: installed_tests_execdir,
|
|
install: install,
|
|
)
|
|
|
|
suite = ['gio'] + extra_args.get('suite', [])
|
|
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
|
|
local_test_env = test_env
|
|
|
|
foreach var, value : extra_args.get('env', {})
|
|
local_test_env.append(var, value)
|
|
endforeach
|
|
|
|
test(test_name, exe,
|
|
env : local_test_env,
|
|
timeout : timeout,
|
|
suite : suite,
|
|
is_parallel : extra_args.get('is_parallel', true),
|
|
depends : extra_args.get('depends', []),
|
|
)
|
|
endforeach
|
|
|
|
foreach program_name, extra_args : test_extra_programs
|
|
source = extra_args.get('source', program_name + '.c')
|
|
extra_sources = extra_args.get('extra_sources', [])
|
|
install = installed_tests_enabled and extra_args.get('install', true)
|
|
executable(program_name, [source, extra_sources],
|
|
c_args : test_c_args,
|
|
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
|
|
install_dir : installed_tests_execdir,
|
|
install : install,
|
|
)
|
|
endforeach
|
|
|
|
foreach test_name : python_tests
|
|
test(
|
|
test_name,
|
|
python,
|
|
args: ['-B', files(test_name)],
|
|
env: test_env,
|
|
suite: ['gio', 'no-valgrind'],
|
|
)
|
|
|
|
if installed_tests_enabled
|
|
install_data(
|
|
files(test_name),
|
|
install_dir: installed_tests_execdir,
|
|
install_mode: 'rwxr-xr-x',
|
|
)
|
|
|
|
test_conf = configuration_data()
|
|
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
|
test_conf.set('program', test_name)
|
|
test_conf.set('env', '')
|
|
configure_file(
|
|
input: installed_tests_template_tap,
|
|
output: test_name + '.test',
|
|
install_dir: installed_tests_metadir,
|
|
configuration: test_conf,
|
|
)
|
|
endif
|
|
endforeach
|
|
|
|
# TAP test runner for Python tests
|
|
if installed_tests_enabled
|
|
install_data(
|
|
files('taptestrunner.py'),
|
|
install_dir: installed_tests_execdir,
|
|
)
|
|
endif
|
|
|
|
subdir('services')
|
|
subdir('modules')
|