From 82e92e90ec3c255db7f4ee90f9919229f45b27e2 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 4 Jul 2021 17:50:41 -0400 Subject: [PATCH] expand tests to check both static and shared intl dependency --- test cases/frameworks/6 gettext/meson.build | 2 +- test cases/frameworks/6 gettext/meson_options.txt | 1 + test cases/frameworks/6 gettext/test.json | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test cases/frameworks/6 gettext/meson_options.txt diff --git a/test cases/frameworks/6 gettext/meson.build b/test cases/frameworks/6 gettext/meson.build index 9856341aa..2640ab29c 100644 --- a/test cases/frameworks/6 gettext/meson.build +++ b/test cases/frameworks/6 gettext/meson.build @@ -10,7 +10,7 @@ if not xgettext.found() error('MESON_SKIP_TEST xgettext not found.') endif -intl = dependency('intl', required: false) +intl = dependency('intl', required: false, static: get_option('static')) if not intl.found() error('MESON_SKIP_TEST libintl/gettext functions not found.') endif diff --git a/test cases/frameworks/6 gettext/meson_options.txt b/test cases/frameworks/6 gettext/meson_options.txt new file mode 100644 index 000000000..f41ed254e --- /dev/null +++ b/test cases/frameworks/6 gettext/meson_options.txt @@ -0,0 +1 @@ +option('static', type : 'boolean', value : false, description : 'build statically linked binaries') diff --git a/test cases/frameworks/6 gettext/test.json b/test cases/frameworks/6 gettext/test.json index 55a475a67..12ce27a89 100644 --- a/test cases/frameworks/6 gettext/test.json +++ b/test cases/frameworks/6 gettext/test.json @@ -11,5 +11,13 @@ {"type": "file", "file": "usr/share/applications/test3.desktop"}, {"type": "file", "file": "usr/share/applications/test4.desktop"} ], + "matrix": { + "options": { + "static": [ + { "val": "true" }, + { "val": "false" } + ] + } + }, "skip_on_jobname": ["azure", "cygwin"] }