summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtesting/test_env.py2
-rwxr-xr-xtools/isolate/run_test_from_archive.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/testing/test_env.py b/testing/test_env.py
index 4e60dbd..84967d1 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -23,6 +23,8 @@ def run_executable(cmd, env):
env['LANGUAGE'] = 'en_US.UTF-8'
# Used by base/base_paths_linux.cc
env['CR_SOURCE_ROOT'] = os.path.abspath(ROOT_DIR).encode('utf-8')
+ # Ensure paths are correctly separated on windows.
+ cmd[0] = cmd[0].replace('/', os.path.sep)
if cmd[0].endswith('.py'):
cmd.insert(0, sys.executable)
try:
diff --git a/tools/isolate/run_test_from_archive.py b/tools/isolate/run_test_from_archive.py
index 11bc268..654dc81 100755
--- a/tools/isolate/run_test_from_archive.py
+++ b/tools/isolate/run_test_from_archive.py
@@ -265,6 +265,8 @@ def run_tha_test(manifest, cache_dir, remote, max_cache_size, min_free_space):
if manifest.get('read_only'):
make_writable(outdir, True)
cmd = manifest['command']
+ # Ensure paths are correctly separated on windows.
+ cmd[0] = cmd[0].replace('/', os.path.sep)
logging.info('Running %s, cwd=%s' % (cmd, cwd))
return subprocess.call(cmd, cwd=cwd)
finally: