Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable 'test cases/frameworks/10 gtk-doc' for gtkdoc >= 1.26 

Enable 'test cases/frameworks/10 gtk-doc' if gtkdoc version is 1.26 or
later.

Old versions of gtkdoc-scan also output the version to stdout rather than
stderr, so be sure to handle that...
This commit is contained in:
Jon Turney 2018-02-12 21:58:20 +00:00 committed by Jussi Pakkanen
parent d040ce4165
commit 16f80b4c50
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run_project_tests.py
View File

@ -445,8 +445,8 @@ def skippable(suite, test):
if not suite.endswith('frameworks'):
return True
# gtk-doc test is always skipped pending upstream fixes for spaces in
# filenames landing in distros
# gtk-doc test may be skipped, pending upstream fixes for spaces in
# filenames landing in the distro used for CI
if test.endswith('10 gtk-doc'):
return True

13
test cases/frameworks/10 gtk-doc/meson.build
View File

@ -13,8 +13,15 @@ inc = include_directories('include')
subdir('include')
# We have to disable this test until this bug fix has landed to
# distros https://bugzilla.gnome.org/show_bug.cgi?id=753145
error('MESON_SKIP_TEST can not enable gtk-doc test until upstream fixes have landed.')
# disable this test unless a bug fix for spaces in pathnames is present
# https://bugzilla.gnome.org/show_bug.cgi?id=753145
result = run_command(gtkdoc, ['--version'])
gtkdoc_ver = result.stdout().strip()
if gtkdoc_ver == ''
gtkdoc_ver = result.stderr().strip()
endif
if gtkdoc_ver.version_compare('<1.26')
error('MESON_SKIP_TEST gtk-doc test requires gtkdoc >= 1.26.')
endif
subdir('doc')