From 2c8e676e2bc490e7d7e9e2649fcbc2d9afefd5e0 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 23 Jan 2020 17:29:51 +0530 Subject: tests: Fix some test failures on Ubuntun 16.04 CI * xenial doesn't ship many dependencies, so make them all optional since we don't guarantee that everything will work * cmake/{5,6}: needs stdlib.h for EXIT_SUCCESS on GCC 5 * common/222: needs C++11, and GCC 5 doesn't understand `auto` correctly unless we explicitly enable it. * frameworks/1 boost: xenial doesn't ship boost_python3, so make it properly optional * frameworks/6 gettext: gettext can be installed without xgettext, which doesn't cause the project to fail, but the installed files list is different which causes the test to fail. * frameworks/7 gnome: gobject-introspection can't be enabled because the sanitizer unit test detects leaks in glib and fails --- test cases/frameworks/1 boost/meson.build | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'test cases/frameworks/1 boost') diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index b528dca7c..2dce40d29 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -40,14 +40,10 @@ if(python2dep.found() and host_machine.system() == 'linux') # on the installed version of python (and hope that they match the version boost # was compiled against) py2version_string = ''.join(python2dep.version().split('.')) - bpython2dep = dependency('boost', modules : ['python' + py2version_string]) + bpython2dep = dependency('boost', modules : ['python' + py2version_string], required: false, disabler: true) else # if we have an older version of boost, we need to use the old module names - bpython2dep = dependency('boost', modules : ['python']) - endif - - if not (bpython2dep.found()) - bpython2dep = disabler() + bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) endif else python2dep = disabler() @@ -57,13 +53,9 @@ endif if(python3dep.found() and host_machine.system() == 'linux') if(dep.version().version_compare('>=1.67')) py3version_string = ''.join(python3dep.version().split('.')) - bpython3dep = dependency('boost', modules : ['python' + py3version_string]) + bpython3dep = dependency('boost', modules : ['python' + py3version_string], required: false, disabler: true) else - bpython3dep = dependency('boost', modules : ['python3']) - endif - - if not (bpython3dep.found()) - bpython3dep = disabler() + bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) endif else python3dep = disabler() -- cgit v1.3