diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2020-08-21 15:16:07 +0000 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2020-08-21 15:16:07 +0000 |
commit | 9e7c27376f57064ac44833abd530c12e5943e2f7 (patch) | |
tree | d6343e1bbced12fc9c56b0bd093f06d9affccc9a | |
parent | d0a6188cfdf5a90962cb334f6c344165be0c5940 (diff) | |
parent | 74c9a37c808ab4ea18cc8cd74a2306a6b98de152 (diff) | |
download | gtk-doc-9e7c27376f57064ac44833abd530c12e5943e2f7.tar.gz |
Merge branch 'wip/smcv/ci-meson-tests' into 'master'
Run tests under Meson again
See merge request GNOME/gtk-doc!52
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | meson.build | 7 | ||||
-rw-r--r-- | tests/annotations/docs/meson.build | 2 | ||||
-rw-r--r-- | tests/annotations/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/bugs/docs/meson.build | 8 | ||||
-rw-r--r-- | tests/bugs/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/empty/docs/meson.build | 2 | ||||
-rw-r--r-- | tests/empty/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/fail/docs/meson.build | 2 | ||||
-rw-r--r-- | tests/fail/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/gobject/docs/meson.build | 8 | ||||
-rw-r--r-- | tests/gobject/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/gtkdocentities.ent.in | 7 | ||||
-rw-r--r-- | tests/program/docs/meson.build | 2 | ||||
-rw-r--r-- | tests/program/docs/xml/meson.build | 5 | ||||
-rw-r--r-- | tests/repro/docs/meson.build | 2 |
16 files changed, 70 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77b3b19..3f84030 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ meson-build: script: - meson --prefix /usr _build . - ninja -C _build - - meson test -C _build || true + - meson test -C _build except: - tags diff --git a/meson.build b/meson.build index e821e35..0345989 100644 --- a/meson.build +++ b/meson.build @@ -99,7 +99,12 @@ binary_in.set('datarootdir', join_paths('${prefix}', get_option('datadir'))) binary_in.set('datadir', '${datarootdir}') binary_in.set('PACKAGE', package_name) - +binary_in.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/gtk-doc/issues') +binary_in.set('PACKAGE_NAME', package_name) +binary_in.set('PACKAGE_STRING', package_name) +binary_in.set('PACKAGE_TARNAME', package_name) +binary_in.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/gtk-doc') +binary_in.set('PACKAGE_VERSION', version) binary_in.set('VERSION', version) foreach binary: gtkdoc_binaires diff --git a/tests/annotations/docs/meson.build b/tests/annotations/docs/meson.build index 2ec4b8f..bc27cf8 100644 --- a/tests/annotations/docs/meson.build +++ b/tests/annotations/docs/meson.build @@ -21,6 +21,8 @@ annotations_test_output_dir = join_paths( annotations_test_html_data = [] +subdir('xml') + test( 'test-annotations-scan', python_prg, diff --git a/tests/annotations/docs/xml/meson.build b/tests/annotations/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/annotations/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/bugs/docs/meson.build b/tests/bugs/docs/meson.build index e70f1c1..dc2e50b 100644 --- a/tests/bugs/docs/meson.build +++ b/tests/bugs/docs/meson.build @@ -21,6 +21,14 @@ bugs_test_output_dir = join_paths( bugs_test_html_data = [] +subdir('xml') + +configure_file( + input: join_paths(bugs_test_docs_dir, 'tester-sections.txt'), + output: 'tester-sections.txt', + copy: true, +) + test( 'test-bugs-scan', python_prg, diff --git a/tests/bugs/docs/xml/meson.build b/tests/bugs/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/bugs/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/empty/docs/meson.build b/tests/empty/docs/meson.build index f05939c..d002f43 100644 --- a/tests/empty/docs/meson.build +++ b/tests/empty/docs/meson.build @@ -21,6 +21,8 @@ empty_test_output_dir = join_paths( empty_test_html_data = [] +subdir('xml') + test( 'test-empty-scan', python_prg, diff --git a/tests/empty/docs/xml/meson.build b/tests/empty/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/empty/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/fail/docs/meson.build b/tests/fail/docs/meson.build index 8a5b9c2..f578b9b 100644 --- a/tests/fail/docs/meson.build +++ b/tests/fail/docs/meson.build @@ -21,6 +21,8 @@ fail_test_output_dir = join_paths( fail_test_html_data = [] +subdir('xml') + test( 'test-fail-scan', python_prg, diff --git a/tests/fail/docs/xml/meson.build b/tests/fail/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/fail/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build index e1e6acc..be8c01c 100644 --- a/tests/gobject/docs/meson.build +++ b/tests/gobject/docs/meson.build @@ -21,6 +21,14 @@ gobject_test_output_dir = join_paths( gobject_test_html_data = [] +subdir('xml') + +configure_file( + input: join_paths(gobject_test_docs_dir, 'tester-sections.txt'), + output: 'tester-sections.txt', + copy: true, +) + test( 'test-gobject-scan', python_prg, diff --git a/tests/gobject/docs/xml/meson.build b/tests/gobject/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/gobject/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/gtkdocentities.ent.in b/tests/gtkdocentities.ent.in new file mode 100644 index 0000000..c4ba2bf --- /dev/null +++ b/tests/gtkdocentities.ent.in @@ -0,0 +1,7 @@ +<!ENTITY package "${PACKAGE}"> +<!ENTITY package_bugreport "${PACKAGE_BUGREPORT}"> +<!ENTITY package_name "${PACKAGE_NAME}"> +<!ENTITY package_string "${PACKAGE_STRING}"> +<!ENTITY package_tarname "${PACKAGE_TARNAME}"> +<!ENTITY package_url "${PACKAGE_URL}"> +<!ENTITY package_version "${PACKAGE_VERSION}"> diff --git a/tests/program/docs/meson.build b/tests/program/docs/meson.build index 1520e7e..5806fc2 100644 --- a/tests/program/docs/meson.build +++ b/tests/program/docs/meson.build @@ -21,6 +21,8 @@ program_test_output_dir = join_paths( program_test_html_data = [] +subdir('xml') + test( 'test-program-scan', python_prg, diff --git a/tests/program/docs/xml/meson.build b/tests/program/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/program/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/repro/docs/meson.build b/tests/repro/docs/meson.build index 08a0f08..09554f9 100644 --- a/tests/repro/docs/meson.build +++ b/tests/repro/docs/meson.build @@ -21,6 +21,8 @@ repro_test_output_dir = join_paths( repro_test_html_data = [] +subdir('xml') + test( 'test-repro-scan', python_prg, |