Vendor import of clang trunk r130700:

http://llvm.org/svn/llvm-project/cfe/trunk@130700

1 files changed, 7 insertions, 2 deletions

diff --git a/test/lit.cfg b/test/lit.cfg
index 6567c6d2..4b9d529 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') )
@@ -166,3 +167,7 @@ config.substitutions.append(
 # Set available features we allow tests to conditionalize on.
 if platform.system() != 'Windows':
     config.available_features.add('crash-recovery')
+
+# Shell execution
+if platform.system() not in ['Windows'] or lit.getBashPath() != '':
+    config.available_features.add('shell')