From c9d8d4628e4ae4409d09f255cc18517cdd5f1fbe Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Sun, 12 Jul 2020 09:53:17 -0400 Subject: simplify/correct test logic before this, tests were being skipped on Ubuntu 20.04 with Anaconda Python Now, all 5 tests success --- test cases/python/2 extmodule/meson.build | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'test cases/python/2 extmodule') diff --git a/test cases/python/2 extmodule/meson.build b/test cases/python/2 extmodule/meson.build index 54c50b4be..18d70c895 100644 --- a/test cases/python/2 extmodule/meson.build +++ b/test cases/python/2 extmodule/meson.build @@ -7,26 +7,29 @@ if meson.backend() != 'ninja' error('MESON_SKIP_TEST: Ninja backend required') endif + py_mod = import('python') py = py_mod.find_installation() -py_dep = py.dependency() +py_dep = py.dependency(required: false) -if py_dep.found() - subdir('ext') +if not py_dep.found() + error('MESON_SKIP_TEST: Python libraries not found.') +endif - test('extmod', - py, - args : files('blaster.py'), - env : ['PYTHONPATH=' + pypathdir]) +subdir('ext') - # Check we can apply a version constraint - dependency('python3', version: '>=@0@'.format(py_dep.version())) +test('extmod', + py, + args : files('blaster.py'), + env : ['PYTHONPATH=' + pypathdir]) -else - error('MESON_SKIP_TEST: Python3 libraries not found, skipping test.') -endif py3_pkg_dep = dependency('python3', method: 'pkg-config', required : false) if py3_pkg_dep.found() python_lib_dir = py3_pkg_dep.get_pkgconfig_variable('libdir') + + # Check we can apply a version constraint + dependency('python3', version: '>=@0@'.format(py_dep.version())) +else + message('Skipped python3 pkg-config test') endif -- cgit v1.2.3