aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-03-04 18:58:03 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-03-04 20:04:20 +0200
commit06dadfc45f5066d0f3474ee7580784ce089552e4 (patch)
tree9aec1ab6577827270f2804f5b6c33cadddcdd658
parenta8da0e25eac650b086c380be6996c908a140a20d (diff)
downloadmeson-06dadfc45f5066d0f3474ee7580784ce089552e4.zip
meson-06dadfc45f5066d0f3474ee7580784ce089552e4.tar.gz
meson-06dadfc45f5066d0f3474ee7580784ce089552e4.tar.bz2
Make gtkdoc test pass on Debian unstable.
-rw-r--r--test cases/frameworks/10 gtk-doc/include/meson.build3
-rw-r--r--test cases/frameworks/10 gtk-doc/installed_files.txt (renamed from test cases/frameworks/10 gtk-doc/installed_files.txt.bak)12
2 files changed, 9 insertions, 6 deletions
diff --git a/test cases/frameworks/10 gtk-doc/include/meson.build b/test cases/frameworks/10 gtk-doc/include/meson.build
index f6dd99f..aa32885 100644
--- a/test cases/frameworks/10 gtk-doc/include/meson.build
+++ b/test cases/frameworks/10 gtk-doc/include/meson.build
@@ -13,4 +13,5 @@ generate_enums_docbook = find_program('generate-enums-docbook.py')
docbook = custom_target('enum-docbook',
output : 'bar.xml',
- command : [generate_enums_docbook, '@OUTPUT@', 'BAR', 'BAR_TYPE', 'BAR_FOO'])
+ command : [generate_enums_docbook, '@OUTPUT@', 'BAR', 'BAR_TYPE', 'BAR_FOO'],
+ build_by_default : true)
diff --git a/test cases/frameworks/10 gtk-doc/installed_files.txt.bak b/test cases/frameworks/10 gtk-doc/installed_files.txt
index 9004af2..6f8ca01 100644
--- a/test cases/frameworks/10 gtk-doc/installed_files.txt.bak
+++ b/test cases/frameworks/10 gtk-doc/installed_files.txt
@@ -1,13 +1,15 @@
+usr/include/foo-version.h
+usr/share/gtk-doc/html/foobar/BAR.html
usr/share/gtk-doc/html/foobar/foobar.devhelp2
-usr/share/gtk-doc/html/foobar/foobar-foo.html
usr/share/gtk-doc/html/foobar/foobar.html
+usr/share/gtk-doc/html/foobar/foobar-foo.html
+usr/share/gtk-doc/html/foobar/foobar-foo-version.html
usr/share/gtk-doc/html/foobar/home.png
usr/share/gtk-doc/html/foobar/index.html
-usr/share/gtk-doc/html/foobar/index.sgml
-usr/share/gtk-doc/html/foobar/left-insensitive.png
usr/share/gtk-doc/html/foobar/left.png
-usr/share/gtk-doc/html/foobar/right-insensitive.png
+usr/share/gtk-doc/html/foobar/left-insensitive.png
usr/share/gtk-doc/html/foobar/right.png
+usr/share/gtk-doc/html/foobar/right-insensitive.png
usr/share/gtk-doc/html/foobar/style.css
-usr/share/gtk-doc/html/foobar/up-insensitive.png
usr/share/gtk-doc/html/foobar/up.png
+usr/share/gtk-doc/html/foobar/up-insensitive.png