diff options
| -rw-r--r-- | examples/python/meson.build | 9 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | tests/functional-tests/meson.build | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/examples/python/meson.build b/examples/python/meson.build index 39c464520..47bac5af0 100644 --- a/examples/python/meson.build +++ b/examples/python/meson.build @@ -1,13 +1,14 @@ -python = find_program('python3') - env = environment() env.prepend('GI_TYPELIB_PATH', tracker_sparql_uninstalled_dir) env.prepend('LD_LIBRARY_PATH', tracker_sparql_uninstalled_dir) env.prepend('PYTHONPATH', tracker_uninstalled_testutils_dir) env.set('TRACKER_EXAMPLES_AUTOMATED_TEST', '1') env.set('TEST_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir) +env.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', join_paths(source_root, 'src', 'libtracker-common', 'stop-words')) -sandbox_python_args = ['-m', 'trackertestutils', '--store-tmpdir', '--dbus-config', meson.current_build_dir() / '..' / '..' / 'tests' / 'test-bus.conf'] +sandbox_python_args = ['-m', 'trackertestutils', + '--store-tmpdir', + '--dbus-config', meson.current_build_dir() / '..' / '..' / 'tests' / 'test-bus.conf'] examples = [ 'endpoint', @@ -16,7 +17,7 @@ examples = [ foreach example_name: examples file = meson.current_source_dir() / '@0@.py'.format(example_name) test(example_name, python, - args: sandbox_python_args + [file], + args: sandbox_python_args + [python.path(), file], env: env, suite: 'examples') endforeach diff --git a/meson.build b/meson.build index d37ed4511..43935b803 100644 --- a/meson.build +++ b/meson.build @@ -65,6 +65,12 @@ if get_option('man') xsltproc = find_program('xsltproc') endif +py_modules = ['gi'] +if get_option('tests_tap_protocol') + py_modules += 'tap' +endif +python = import('python').find_installation('python3', modules: py_modules) + add_project_arguments('-Wformat', '-Wformat-security', language: 'c') # There are various gchar vs. unsigned char warnings that occur in extract diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build index 921a88386..c0a3b4bd6 100644 --- a/tests/functional-tests/meson.build +++ b/tests/functional-tests/meson.build @@ -1,14 +1,9 @@ -modules = ['gi'] - if get_option('tests_tap_protocol') protocol = 'tap' - modules += 'tap' else protocol = 'exitcode' endif -python = import('python').find_installation('python3', modules: modules) - testconf = configuration_data() config_json_full_path = join_paths(meson.current_build_dir(), 'configuration.json') |