summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-01-05 19:37:03 +0000
committerZachary Turner <zturner@google.com>2015-01-05 19:37:03 +0000
commitf6896b09b4ef0eff426fab40280c45455562b9c8 (patch)
treed6ad52b8d84dcf1eb9b2401e46b646be4a4e8b19
parent502b7b4b36c90a4e8d6ee4a0cf88eabbdae5769d (diff)
downloadbcm5719-llvm-f6896b09b4ef0eff426fab40280c45455562b9c8.tar.gz
bcm5719-llvm-f6896b09b4ef0eff426fab40280c45455562b9c8.zip
Fix about 20 tests on Windows.
Passing the argument string from dosep to dotest was failing on Windows due to the fact that Windows uses \ for its path separator. As a result, shlex.split() was treating it as an escape character. This fixes the issue by telling shlex.split() to not use posix mode when running on Windows. llvm-svn: 225195
-rwxr-xr-xlldb/test/dosep.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lldb/test/dosep.py b/lldb/test/dosep.py
index 4571320d59f..c7e2b8c7d08 100755
--- a/lldb/test/dosep.py
+++ b/lldb/test/dosep.py
@@ -64,8 +64,11 @@ def process_dir(root, files, test_root, dotest_options):
if os.path.islink(path):
continue
- command = ([sys.executable, "%s/dotest.py" % test_root] +
- (shlex.split(dotest_options) if dotest_options else []) +
+ script_file = os.path.join(test_root, "dotest.py")
+ is_posix = (os.name == "posix")
+ split_args = shlex.split(dotest_options, posix=is_posix) if dotest_options else []
+ command = ([sys.executable, script_file] +
+ split_args +
["-p", name, root])
timeout_name = os.path.basename(os.path.splitext(name)[0]).upper()
OpenPOWER on IntegriCloud