Skip to content

Add gnome, gtk-doc, and vala regression tests #9819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nirbheek merged 4 commits into from
Jan 14, 2022
Merged

Add gnome, gtk-doc, and vala regression tests #9819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2aa62e7
tests: Add a regression test for vapigen metadatadir
nirbheek Jan 13, 2022
2499bb7
tests: Add a regression test for gtk-doc arguments
nirbheek Jan 13, 2022
2216e68
tests: Add regression tests for gdbus_codegen args
nirbheek Jan 13, 2022
b1b1f0c
tests: Add a partial test for gtk_doc check: kwarg
nirbheek Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added test cases/frameworks/10 gtk-doc/doc/foobar1/baz.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added test cases/frameworks/10 gtk-doc/doc/foobar1/baz.png.in
View file
Open in desktop
Empty file.
8 changes: 7 additions & 1 deletion test cases/frameworks/10 gtk-doc/doc/foobar1/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
png = configure_file(input: 'baz.png.in',
output: 'baz.png',
copy: true)

gnome.gtkdoc('foobar',
src_dir : [inc, '.'],
main_sgml : 'foobar-docs.sgml',
content_files : [docbook, version_xml],
dependencies: foo_dep,
html_assets: ['baz.jpg', png],
# Manually written types file for regression test:
# https://github.com/mesonbuild/meson/issues/8744
gobject_typesfile: 'foobar.types',
install : true)
install : true,
check: false)
7 changes: 7 additions & 0 deletions test cases/frameworks/10 gtk-doc/doc/foobar2/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
types = configure_file(input: '../foobar1/foobar.types',
output: 'foobar.types',
copy: true
)

gnome.gtkdoc('foobar2',
src_dir : inc,
main_sgml : 'foobar-docs.sgml',
content_files : [docbook, version_xml],
gobject_typesfile: types,
dependencies: foo_dep,
install : true,
install_dir : 'foobar2')
2 changes: 2 additions & 0 deletions test cases/frameworks/10 gtk-doc/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"installed": [
{"type": "file", "file": "usr/include/foo-version.h"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/BAR.html"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/baz.jpg"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/baz.png"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/foobar.devhelp2"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/foobar.html"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar/FooObj.html"},
Expand Down
4 changes: 4 additions & 0 deletions test cases/frameworks/7 gnome/gdbus/data/com.example.Sample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
<arg direction="in" type="s" name="name"/>
<arg direction="out" type="s" name="greeting"/>
</method>
<method name="Bye">
<arg direction="in" type="s" name="name"/>
<arg direction="out" type="s" name="greeting"/>
</method>
</interface>
</node>
19 changes: 18 additions & 1 deletion test cases/frameworks/7 gnome/gdbus/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,29 @@ assert(gdbus_src.length() == 2, 'expected 2 targets')
assert(gdbus_src[0].full_path().endswith('.c'), 'expected 1 c source file')
assert(gdbus_src[1].full_path().endswith('.h'), 'expected 1 c header file')

sample_xml = configure_file(input: 'data/com.example.Sample.xml',
output: 'com.example.Sample.xml',
copy: true)

gdbus_src = gnome.gdbus_codegen('generated-gdbus-no-docbook-files-posarg',
sample_xml,
interface_prefix : 'com.example.',
namespace : 'Sample',
annotations : [
['com.example.Hello()', 'org.freedesktop.DBus.Deprecated', 'true']
],
)
assert(gdbus_src.length() == 2, 'expected 2 targets')
assert(gdbus_src[0].full_path().endswith('.c'), 'expected 1 c source file')
assert(gdbus_src[1].full_path().endswith('.h'), 'expected 1 c header file')

gdbus_src = gnome.gdbus_codegen('generated-gdbus',
sources : files('data/com.example.Sample.xml'),
interface_prefix : 'com.example.',
namespace : 'Sample',
annotations : [
['com.example.Hello()', 'org.freedesktop.DBus.Deprecated', 'true']
['com.example.Hello()', 'org.freedesktop.DBus.Deprecated', 'true'],
['com.example.Bye()', 'org.freedesktop.DBus.Deprecated', 'true'],
],
docbook : 'generated-gdbus-doc',
install_header : true,
Expand Down
1 change: 1 addition & 0 deletions test cases/vala/11 generated vapi/libfoo/foo.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Foo.bar nullable
7 changes: 7 additions & 0 deletions test cases/vala/11 generated vapi/libfoo/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ libfoo_gir = gnome.generate_gir(libfoo,
],
)

configure_file(
input: 'foo.metadata',
output: 'Foo-@0@.metadata'.format(libfoo_api_ver),
copy: true
)

libfoo_vapi = gnome.generate_vapi('foo-' + libfoo_api_ver,
metadata_dirs: meson.current_build_dir(),
sources: libfoo_gir[0],
install: true,
)
Expand Down