aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNiklas Claesson <nicke.claesson@gmail.com>2018-06-28 23:17:27 +0200
committerNiklas Claesson <nicke.claesson@gmail.com>2018-10-10 21:19:06 +0200
commitfb1f0b969462835a831aea881c59983770e4c6e7 (patch)
tree57e0d7cc755db9f113075fc25ea1a40cd0dc1108 /run_tests.py
parent4911a51aa248f46931b020cd1e08a3ffd9738472 (diff)
downloadmeson-fb1f0b969462835a831aea881c59983770e4c6e7.zip
meson-fb1f0b969462835a831aea881c59983770e4c6e7.tar.gz
meson-fb1f0b969462835a831aea881c59983770e4c6e7.tar.bz2
Fix type-bug cannot add str to list
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py
index 8ecef30..7bb601a 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -284,7 +284,10 @@ def main():
'import coverage\n'
'coverage.process_startup()\n')
env['COVERAGE_PROCESS_START'] = '.coveragerc'
- env['PYTHONPATH'] = os.pathsep.join([temp_dir] + env.get('PYTHONPATH', []))
+ if 'PYTHONPATH' in env:
+ env['PYTHONPATH'] = os.pathsep.join([temp_dir, env.get('PYTHONPATH')])
+ else:
+ env['PYTHONPATH'] = temp_dir
if not cross:
cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v']
if options.failfast: