From e4b4911410fda0835ab72593c3d4c4e264d21914 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 16:42:37 +0000 Subject: Skip test cases/frameworks/1 boost if boost not found --- test cases/frameworks/1 boost/meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index 771ecbc6f..df55b3050 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -5,6 +5,11 @@ add_project_arguments(['-DBOOST_LOG_DYN_LINK'], language : 'cpp' ) +dep = dependency('boost', required: false) +if not dep.found() + error('MESON_SKIP_TEST boost not found.') +endif + # We want to have multiple separate configurations of Boost # within one project. The need to be independent of each other. # Use one without a library dependency and one with it. -- cgit v1.2.3 From 7d974cd9629db088cffce1ecb095ace4f1d68846 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 16:51:21 +0000 Subject: Skip test cases/frameworks/4 qt if Qt5 not found --- test cases/frameworks/4 qt/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index b0e848d26..b508df303 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -21,6 +21,14 @@ foreach qt : ['qt4', 'qt5'] error('Invalid qt dep incorrectly found!') endif + # This test should be skipped if qt5 isn't found + if qt == 'qt5' + dep = dependency(qt, modules : ['Core'], required : false, method : get_option('method')) + if not dep.found() + error('MESON_SKIP_TEST qt5 not found.') + endif + endif + # Ensure that the "no-Core-module-specified" code branch is hit nocoredep = dependency(qt, modules : ['Gui'], required : qt == 'qt5', method : get_option('method')) -- cgit v1.2.3 From 5ff84e4f50e34bfda5a1f5597d76b767c5c511a0 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 16:30:35 +0000 Subject: Skip test cases/frameworks/6 gettext if prereqs not found Skip test cases/frameworks/6 gettext if gettext or libintl not found --- test cases/frameworks/6 gettext/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/6 gettext/meson.build b/test cases/frameworks/6 gettext/meson.build index 6b517a490..e02234b56 100644 --- a/test cases/frameworks/6 gettext/meson.build +++ b/test cases/frameworks/6 gettext/meson.build @@ -1,5 +1,14 @@ project('gettext example', 'c') +gettext = find_program('gettext', required: false) +if not gettext.found() + error('MESON_SKIP_TEST gettext not found.') +endif + +if not meson.get_compiler('c').has_header('libintl.h') + error('MESON_SKIP_TEST libintl.h not found.') +endif + i18n = import('i18n') subdir('po') -- cgit v1.2.3 From 68a5b8d9fc34a68bd9f7b8cdb9eb699807fcb2ba Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 17:02:19 +0000 Subject: Skip test cases/frameworks/7 gnome if prereqs not found Skip test cases/frameworks/7 gnome if glib or python3-gi not found --- test cases/frameworks/7 gnome/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build index 795f458e9..03335b885 100644 --- a/test cases/frameworks/7 gnome/meson.build +++ b/test cases/frameworks/7 gnome/meson.build @@ -1,5 +1,16 @@ project('gobject-introspection', 'c') +glib = dependency('glib-2.0', required: false) +if not glib.found() + error('MESON_SKIP_TEST glib not found.') +endif + +python3 = import('python3') +py3 = python3.find_python() +if run_command(py3, '-c', 'import gi;').returncode() != 0 + error('MESON_SKIP_TEST python3-gi not found') +endif + cc = meson.get_compiler('c') add_global_arguments('-DMESON_TEST', language : 'c') -- cgit v1.2.3 From b5edf78204059f9b961191e5b5daef6f7fe88e07 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 19:03:25 +0000 Subject: Skip test cases/frameworks/8 flex if flex or bison not found --- test cases/frameworks/8 flex/meson.build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/8 flex/meson.build b/test cases/frameworks/8 flex/meson.build index 13ac9f634..cb5efdeb4 100644 --- a/test cases/frameworks/8 flex/meson.build +++ b/test cases/frameworks/8 flex/meson.build @@ -4,8 +4,16 @@ project('flex and bison', 'c') # may output headers that are necessary to build # the sources of a different generator. -flex = find_program('flex') -bison = find_program('bison') +flex = find_program('flex', required: false) +bison = find_program('bison', required: false) + +if not flex.found() + error('MESON_SKIP_TEST flex not found.') +endif + +if not bison.found() + error('MESON_SKIP_TEST bison not found.') +endif lgen = generator(flex, output : '@PLAINNAME@.yy.c', @@ -23,4 +31,3 @@ e = executable('pgen', 'prog.c', lfiles, pfiles) test('parsertest', e) - -- cgit v1.2.3 From 90cbe48968e454c5e6550ce698aca3e9f44f6954 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 21:04:24 +0000 Subject: Skip test cases/frameworks/10 gtk-doc if gtkdoc not found --- test cases/frameworks/10 gtk-doc/meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build index e5e77058d..71f341cfd 100644 --- a/test cases/frameworks/10 gtk-doc/meson.build +++ b/test cases/frameworks/10 gtk-doc/meson.build @@ -1,5 +1,10 @@ project('gtkdoctest', 'c', version : '1.0.0') +gtkdoc = find_program('gtkdoc-scan', required: false) +if not gtkdoc.found() + error('MESON_SKIP_TEST gtkdoc not found.') +endif + gnome = import('gnome') assert(gnome.gtkdoc_html_dir('foobar') == 'share/gtk-doc/html/foobar', 'Gtkdoc install dir is incorrect.') -- cgit v1.2.3 From 1d36df3d4077fb887f934b15c2f7c8ae70679e4f Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 17:17:34 +0000 Subject: Skip test cases/frameworks/11 gir subproject if prereqs not found Skip test cases/frameworks/11 gir subproject if g-ir-scanner or python3-gi not found --- test cases/frameworks/11 gir subproject/meson.build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/11 gir subproject/meson.build b/test cases/frameworks/11 gir subproject/meson.build index f3bde4042..a599ae9eb 100644 --- a/test cases/frameworks/11 gir subproject/meson.build +++ b/test cases/frameworks/11 gir subproject/meson.build @@ -1,5 +1,16 @@ project('gobject-introspection-with-subproject', 'c') +gir = find_program('g-ir-scanner', required: false) +if not gir.found() + error('MESON_SKIP_TEST g-ir-scanner not found.') +endif + +python3 = import('python3') +py3 = python3.find_python() +if run_command(py3, '-c', 'import gi;').returncode() != 0 + error('MESON_SKIP_TEST python3-gi not found') +endif + gnome = import('gnome') gobj = dependency('gobject-2.0') @@ -7,4 +18,3 @@ add_global_arguments('-DMESON_TEST', language : 'c') meson_gir = dependency('meson-gir', fallback : ['mesongir', 'meson_gir']) subdir('gir') - -- cgit v1.2.3 From d5b8f18f1727fdf99220dc83eba6075f63c6f318 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 17:18:24 +0000 Subject: Skip test cases/frameworks/12 multiple gir if g-ir-scanner not found --- test cases/frameworks/12 multiple gir/meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/12 multiple gir/meson.build b/test cases/frameworks/12 multiple gir/meson.build index 794abc5bc..ddc9830d5 100644 --- a/test cases/frameworks/12 multiple gir/meson.build +++ b/test cases/frameworks/12 multiple gir/meson.build @@ -1,5 +1,10 @@ project('multiple-gobject-introspection', 'c') +gir = find_program('g-ir-scanner', required: false) +if not gir.found() + error('MESON_SKIP_TEST g-ir-scanner not found.') +endif + gnome = import('gnome') gobj = dependency('gobject-2.0') -- cgit v1.2.3 From d78f88160a9ee1cc8d75274599d6c45c7e678d9a Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 11 Feb 2018 23:09:36 +0000 Subject: Skip test cases/frameworks/13 yelp if itstool isn't found --- test cases/frameworks/13 yelp/meson.build | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/13 yelp/meson.build b/test cases/frameworks/13 yelp/meson.build index 725ff7b1b..9fdde25ae 100644 --- a/test cases/frameworks/13 yelp/meson.build +++ b/test cases/frameworks/13 yelp/meson.build @@ -1,2 +1,8 @@ project('yelp', 'c') + +itstool = find_program('itstool', required: false) +if not itstool.found() + error('MESON_SKIP_TEST itstool not found.') +endif + subdir('help') -- cgit v1.2.3 From 2aa7f142237e6644de1790815f403749a8b8885b Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 17:19:07 +0000 Subject: Skip test cases/frameworks/15 llvm if llvm not found --- test cases/frameworks/15 llvm/meson.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build index 549adce90..45cdde47a 100644 --- a/test cases/frameworks/15 llvm/meson.build +++ b/test cases/frameworks/15 llvm/meson.build @@ -1,5 +1,10 @@ project('llvmtest', ['c', 'cpp'], default_options : ['c_std=c99']) +d = dependency('llvm', required : false) +if not d.found() + error('MESON_SKIP_TEST llvm not found.') +endif + d = dependency('llvm', modules : 'not-found', required : false) assert(d.found() == false, 'not-found llvm module found') -- cgit v1.2.3 From a0e98326ca6fa1f17e84861a14e44ecc37138735 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 16:31:33 +0000 Subject: Skip test cases/frameworks/16 sdl2 if sdl2 not found --- test cases/frameworks/16 sdl2/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/16 sdl2/meson.build b/test cases/frameworks/16 sdl2/meson.build index 61a34efa0..1bbf09f71 100644 --- a/test cases/frameworks/16 sdl2/meson.build +++ b/test cases/frameworks/16 sdl2/meson.build @@ -1,6 +1,10 @@ project('sdl2 test', 'c') -sdl2_dep = dependency('sdl2', version : '>=2.0.0') +sdl2_dep = dependency('sdl2', version : '>=2.0.0', required: false) + +if not sdl2_dep.found() + error('MESON_SKIP_TEST sdl2 not found.') +endif e = executable('sdl2prog', 'sdl2prog.c', dependencies : sdl2_dep) -- cgit v1.2.3 From c650bd78caefeb6482331e3a7d291e8de9ebb0a5 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 2 Jan 2018 20:20:32 +0000 Subject: Skip test cases/frameworks/19 pcap if pcap not found --- test cases/frameworks/19 pcap/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/19 pcap/meson.build b/test cases/frameworks/19 pcap/meson.build index f02f4114b..eb6fc2c14 100644 --- a/test cases/frameworks/19 pcap/meson.build +++ b/test cases/frameworks/19 pcap/meson.build @@ -1,6 +1,10 @@ project('pcap test', 'c') -pcap_dep = dependency('pcap', version : '>=1.0') +pcap_dep = dependency('pcap', version : '>=1.0', required: false) + +if not pcap_dep.found() + error('MESON_SKIP_TEST pcap not found.') +endif pcap_ver = pcap_dep.version() assert(pcap_ver.split('.').length() > 1, 'pcap version is "@0@"'.format(pcap_ver)) @@ -9,6 +13,6 @@ e = executable('pcap_prog', 'pcap_prog.c', dependencies : pcap_dep) test('pcaptest', e) -# Ensure discovery bia the configuration tools work also +# Ensure discovery via the configuration tools work also pcap_dep = dependency('pcap', version : '>=1.0', method : 'pcap-config') pcap_dep = dependency('pcap', version : '>=1.0', method : 'config-tool') -- cgit v1.2.3 From 67ef738d61e78835ea1a59bfaf05003f6681bf0d Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 15:43:40 +0000 Subject: Skip test cases/frameworks/20 cups if cups not found --- test cases/frameworks/20 cups/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/20 cups/meson.build b/test cases/frameworks/20 cups/meson.build index 11f6f631b..9040de6e1 100644 --- a/test cases/frameworks/20 cups/meson.build +++ b/test cases/frameworks/20 cups/meson.build @@ -1,6 +1,10 @@ project('cups test', 'c') -cups_dep = dependency('cups', version : '>=1.4') +cups_dep = dependency('cups', version : '>=1.4', required: false) + +if not cups_dep.found() + error('MESON_SKIP_TEST cups not found.') +endif e = executable('cups_prog', 'cups_prog.c', dependencies : cups_dep) -- cgit v1.2.3 From 6243262b67cee8360647aa633d6a66b430174af5 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 18:59:32 +0000 Subject: Fix test cases/frameworks/6 gettext for windows Allow installed file 'intlprog' to have .exe extension --- test cases/frameworks/6 gettext/installed_files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/6 gettext/installed_files.txt b/test cases/frameworks/6 gettext/installed_files.txt index ffe543ffe..879f56bc5 100644 --- a/test cases/frameworks/6 gettext/installed_files.txt +++ b/test cases/frameworks/6 gettext/installed_files.txt @@ -1,4 +1,4 @@ -usr/bin/intlprog +usr/bin/intlprog?exe usr/share/locale/de/LC_MESSAGES/intltest.mo usr/share/locale/fi/LC_MESSAGES/intltest.mo usr/share/applications/test.desktop -- cgit v1.2.3 From 8a48e43fd90d3b0b3c55a5117c806e4acb4d9e16 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 17:02:44 +0000 Subject: In test cases/frameworks/8 flex, ensure yyparse() is prototyped Old versions of bison (including the one shipped with macOS) do not prototype yyparse(), just in case you are using a K&R compiler... --- test cases/frameworks/8 flex/prog.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/8 flex/prog.c b/test cases/frameworks/8 flex/prog.c index 1e48f611c..0b84d1823 100644 --- a/test cases/frameworks/8 flex/prog.c +++ b/test cases/frameworks/8 flex/prog.c @@ -6,6 +6,8 @@ #include #include +extern int yyparse(); + int main(int argc, char **argv) { /* int input; -- cgit v1.2.3 From 8d5c6609447c7de30ea2b5b3c502c4b48f2202e2 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 15:14:10 +0000 Subject: Make test cases/frameworks/15 llvm tolerate no libtinfo libtinfo only exists if ncurses is configured --with-termlib --- test cases/frameworks/15 llvm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build index 45cdde47a..b5505eb57 100644 --- a/test cases/frameworks/15 llvm/meson.build +++ b/test cases/frameworks/15 llvm/meson.build @@ -17,7 +17,7 @@ assert(d.found() == true, 'optional module stopped llvm from being found.') dep_tinfo = dependency('tinfo', required : false) if not dep_tinfo.found() cpp = meson.get_compiler('cpp') - dep_tinfo = cpp.find_library('tinfo') + dep_tinfo = cpp.find_library('tinfo', required: false) endif foreach static : [true, false] -- cgit v1.2.3 From 7a618d2817599d1474a5f7a3e71ecfdd1af24d76 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 18:26:19 +0000 Subject: Fix test cases/frameworks/19 pcap for OSX --- test cases/frameworks/19 pcap/pcap_prog.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/19 pcap/pcap_prog.c b/test cases/frameworks/19 pcap/pcap_prog.c index 18e0ad895..0fca16cca 100644 --- a/test cases/frameworks/19 pcap/pcap_prog.c +++ b/test cases/frameworks/19 pcap/pcap_prog.c @@ -4,6 +4,12 @@ int main() { char errbuf[PCAP_ERRBUF_SIZE]; - pcap_t *p = pcap_create(NULL, errbuf); +#ifdef __APPLE__ + // source = NULL for "any" doesn't work on macOS (linux only?) + char *source = "en0"; +#else + char *source = NULL; +#endif + pcap_t *p = pcap_create(source, errbuf); return p == NULL; } -- cgit v1.2.3