aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2011-03-05 11:16:06 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2011-03-05 11:16:06 +0000
commit9085e6f97aa009c3e3aaa88e4afbfa74492f270f (patch)
tree371f4fa5d51fbddb273cf35e1de4ec38cd5edfd2
parent6ac97b1039f848f6089ec4975c7b2d981984289c (diff)
test/lit.cfg: bash is available on MSYS.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127080 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/lit.cfg5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lit.cfg b/test/lit.cfg
index 8542b7d8d7..4b9d529b7d 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -24,7 +24,8 @@ if platform.system() == 'Windows':
#
# For now we require '&&' between commands, until they get globally killed and
# the test runner updated.
-execute_external = platform.system() != 'Windows'
+execute_external = (platform.system() != 'Windows'
+ or lit.getBashPath() not in [None, ""])
config.test_format = lit.formats.ShTest(execute_external)
# suffixes: A list of file extensions to treat as test files.
@@ -137,7 +138,7 @@ def inferClang(PATH):
if lit.useValgrind:
config.target_triple += '-vg'
-config.clang = inferClang(config.environment['PATH'])
+config.clang = inferClang(config.environment['PATH']).replace('\\', '/')
if not lit.quiet:
lit.note('using clang: %r' % config.clang)
config.substitutions.append( ('%clang_cc1', config.clang + ' -cc1') )