summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-11-05 02:06:33 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-11-05 15:28:33 +0200
commitb3eba172130d1bbde882ddd0aeb32f1b3c1689ab (patch)
tree4217f7c49f67c78b6d6648b9609c1e22c36d7897
parent876730d805bb48ac0b458f557b09f66eb0c694d5 (diff)
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--test/py/meson.build8
1 files 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',