diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2018-11-13 21:44:25 -0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-15 22:50:11 +0200 |
| commit | 301df388162153873e21a2732a9f735d1dcba022 (patch) | |
| tree | 655d0077b811f3e1a53e0c49c67c83e3e1c5e725 | |
| parent | 27ff79e026387ebcc657d9c1521b41674ecc2dca (diff) | |
| download | meson-301df388162153873e21a2732a9f735d1dcba022.zip meson-301df388162153873e21a2732a9f735d1dcba022.tar.gz meson-301df388162153873e21a2732a9f735d1dcba022.tar.bz2 | |
hotdoc: Fix has_extensions when several extensions are passed in
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/23 hotdoc/meson.build | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index 1080160..c07391e 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -379,7 +379,7 @@ class HotDocModule(ExtensionModule): @noKwargs def has_extensions(self, state, args, kwargs): - res = self.hotdoc.run_hotdoc(['--has-extension'] + args) == 0 + res = self.hotdoc.run_hotdoc(['--has-extension=%s' % extension for extension in args]) == 0 return ModuleReturnValue(res, [res]) def generate_doc(self, state, args, kwargs): diff --git a/test cases/frameworks/23 hotdoc/meson.build b/test cases/frameworks/23 hotdoc/meson.build index 191569d..dd3c92a 100644 --- a/test cases/frameworks/23 hotdoc/meson.build +++ b/test cases/frameworks/23 hotdoc/meson.build @@ -7,3 +7,9 @@ endif subdir('doc') +assert(hotdoc.has_extensions(['gi-extension']) == true, + 'GI extension should always be found.') + +assert(hotdoc.has_extensions(['gi-extension', 'no-way-you-exist-extension']) == false, + 'A hotdoc extension called "no-way-you-exist-extension" should never be found.') + |