summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/test/lit.cfg5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 8542b7d8d79..4b9d529b7d2 100644
--- a/clang/test/lit.cfg
+++ b/clang/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') )
OpenPOWER on IntegriCloud