update gnome test to cover built gresource files

Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
pull/10513/head
Eli Schwartz 2 years ago
parent 28835cce71
commit ea952966b4
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 4
      test cases/frameworks/7 gnome/resources/generated/meson.build
  2. 27
      test cases/frameworks/7 gnome/resources/meson.build
  3. 2
      test cases/frameworks/7 gnome/test.json

@ -0,0 +1,4 @@
ct_simple_gresource = custom_target(
input : '../simple.gresource.xml',
output : 'simple-ct.gresource.xml',
command : [copyfile, '@INPUT@', '@OUTPUT@'])

@ -30,10 +30,10 @@ gnome.compile_resources('simple-resources',
test('simple resource test (gresource)', find_program('resources.py'))
if not pretend_glib_old and glib.version() >= '2.52.0'
# This test cannot pass if GLib version is older than 9.99.9.
# Meson will raise an error if the user tries to use the 'dependencies'
# argument and the version of GLib is too old for generated resource
# dependencies to work correctly.
# This test cannot pass if GLib version is too old. Generated resource
# dependencies do not work correctly and Meson will raise an error if the
# user tries to use either the 'dependencies' kwarg or a gresource file that
# is itself generated.
generated_resources = gnome.compile_resources('generated-resources',
'generated.gresource.xml',
source_dir : '../resources-data',
@ -44,6 +44,25 @@ if not pretend_glib_old and glib.version() >= '2.52.0'
'generated-main.c', generated_resources,
dependencies: gio)
test('generated resource test', generated_res_exe)
# Test with a CustomTarget
subdir('generated')
ct_resources = gnome.compile_resources(
'ct-resources',
ct_simple_gresource,
install_header : true,
export : true,
source_dir : '../resources-data',
c_name : 'simple_resources')
cti_resources = gnome.compile_resources(
'cti-resources',
ct_simple_gresource[0],
install_header : true,
export : true,
source_dir : '../resources-data',
c_name : 'simple_resources')
endif
# Test build_by_default

@ -1,5 +1,7 @@
{
"installed": [
{"type": "file", "file": "usr/include/ct-resources.h"},
{"type": "file", "file": "usr/include/cti-resources.h"},
{"type": "file", "file": "usr/include/enums.h"},
{"type": "file", "file": "usr/include/enums2.h"},
{"type": "file", "file": "usr/include/enums3.h"},

Loading…
Cancel
Save