aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-02-12 21:58:20 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-27 20:43:51 +0200
commit16f80b4c506bba9839e30bd98fcbbafddcef3632 (patch)
treea95093f28aecb322d23bcd579a46cb64dc206c76 /test cases
parentd040ce4165aab1ba32c96bbc35c2fad10b26664f (diff)
downloadmeson-16f80b4c506bba9839e30bd98fcbbafddcef3632.zip
meson-16f80b4c506bba9839e30bd98fcbbafddcef3632.tar.gz
meson-16f80b4c506bba9839e30bd98fcbbafddcef3632.tar.bz2
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...
Diffstat (limited to 'test cases')
-rw-r--r--test cases/frameworks/10 gtk-doc/meson.build13
1 files changed, 10 insertions, 3 deletions
diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build
index 71f341c..5c22ad0 100644
--- a/test cases/frameworks/10 gtk-doc/meson.build
+++ b/test cases/frameworks/10 gtk-doc/meson.build
@@ -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')