diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-06 20:47:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-06 20:47:48 +0000 |
| commit | d80d151473abe5425f347b89085496c4ee26aecf (patch) | |
| tree | cecdb7c1df944ccc3dd4220c64a005556466a221 | |
| parent | a2db0d636dc92d071ab4de374f2690c501c597e6 (diff) | |
| parent | 56abe0b0d5046cae17c545aa3ae504551ef445b7 (diff) | |
| download | pango-d80d151473abe5425f347b89085496c4ee26aecf.tar.gz | |
Merge branch 'install-test-option' into 'master'
Make installed tests optional
Closes #354
See merge request GNOME/pango!66
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | tests/meson.build | 14 |
3 files changed, 18 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e150803c..1a558544 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ gnome-runtime-linux: before_script: - > dnf install -y \ + glibc-langpack-en \ gcc \ gcc-c++ \ meson \ @@ -24,6 +25,11 @@ gnome-runtime-linux: - meson _build - ninja -C _build - cd _build; meson test --suite pango + artifacts: + name: "%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" + when: always + paths: + - _build/meson-logs msys2-mingw64: stage: build diff --git a/meson_options.txt b/meson_options.txt index 95d7edb8..d2f5f302 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,3 +6,7 @@ option('introspection', description: 'Build the GObject introspection data for Pango', type: 'boolean', value: true) +option('install-tests', + description : 'Install tests', + type: 'boolean', + value: 'false') diff --git a/tests/meson.build b/tests/meson.build index ef97970f..7df7a999 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -94,9 +94,11 @@ endforeach installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango') installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango') -install_data(installed_test_data, install_dir: installed_test_bindir) -install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts')) -install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups')) +if get_option('install-tests') + install_data(installed_test_data, install_dir: installed_test_bindir) + install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts')) + install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups')) +endif python = import('python3').find_python() gen_installed_test = files([ 'gen-installed-test.py' ]) @@ -107,7 +109,7 @@ custom_target('all-unicode', command: [ python, gen_all_unicode, '@OUTPUT@' ], - install: true, + install: get_option('install-tests'), install_dir: installed_test_bindir) foreach t: tests @@ -123,7 +125,7 @@ foreach t: tests name, '@OUTDIR@', ], - install: true, + install: get_option('install-tests'), install_dir: installed_test_datadir) bin = executable(name, src, @@ -131,7 +133,7 @@ foreach t: tests include_directories: root_inc, c_args: common_cflags + pango_debug_cflags + test_cflags, cpp_args: common_cppflags + pango_debug_cflags + test_cflags, - install: true, + install: get_option('install-tests'), install_dir: installed_test_bindir) test(name, bin, env: test_env) |