From b3eba172130d1bbde882ddd0aeb32f1b3c1689ab Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 5 Nov 2024 02:06:33 +0200 Subject: test: py: Replace environment array with environment object The environment for pyunittests is stored in an array. Meson provides an environment object, which makes handling of multi-value environment variables easier and increases code clarity. Switch to using the environment object. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- test/py/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/py/meson.build b/test/py/meson.build index 0b679d31..481bb481 100644 --- a/test/py/meson.build +++ b/test/py/meson.build @@ -13,15 +13,19 @@ if asan_runtime_missing subdir_done() endif +py_env = environment() + pymod = import('python') py3 = pymod.find_installation('python3') pypathdir = meson.project_build_root() / 'src' / 'py' -py_env = ['PYTHONPATH=' + pypathdir] +py_env.append('PYTHONPATH', pypathdir) if asan_enabled + py_env.append('LD_PRELOAD', asan_runtime) + # Disable leak detection as the Python interpreter is full of leaks. - py_env += ['LD_PRELOAD=' + asan_runtime, 'ASAN_OPTIONS=detect_leaks=0'] + py_env.append('ASAN_OPTIONS', 'detect_leaks=0') endif test('pyunittests', -- cgit v1.2.1