Use portable path separator in wrappers.

The semicolon only separates paths on Windows, but the wrapper is
sometimes used on other platforms.
pull/1046/head
Elliott Sales de Andrade 8 years ago committed by Jussi Pakkanen
parent 08c82fd17c
commit 155f163341
  1. 3
      mesonbuild/scripts/meson_exe.py
  2. 3
      mesonbuild/scripts/meson_test.py

@ -53,7 +53,8 @@ def run_exe(exe):
child_env = os.environ.copy() child_env = os.environ.copy()
child_env.update(exe.env) child_env.update(exe.env)
if len(exe.extra_paths) > 0: if len(exe.extra_paths) > 0:
child_env['PATH'] = ';'.join(exe.extra_paths + ['']) + child_env['PATH'] child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) +
child_env['PATH'])
p = subprocess.Popen(cmd + exe.cmd_args, p = subprocess.Popen(cmd + exe.cmd_args,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,

@ -134,7 +134,8 @@ def run_single_test(wrap, test):
child_env.update(test.env) child_env.update(test.env)
if len(test.extra_paths) > 0: if len(test.extra_paths) > 0:
child_env['PATH'] = child_env['PATH'] + ';'.join([''] + test.extra_paths) child_env['PATH'] = (child_env['PATH'] +
os.pathsep.join([''] + test.extra_paths))
if is_windows(): if is_windows():
setsid = None setsid = None
else: else:

Loading…
Cancel
Save