diff options
| -rw-r--r-- | test/lit.cfg | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 575c127333..6f44bb3d8c 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -9,8 +9,20 @@ import re # name: The name of this test suite. config.name = 'LLVM' +# Tweak PATH for Win32 to decide to use bash.exe or not. +if sys.platform in ['win32']: + # Seek sane tools in directories and set to $PATH. + path = getattr(config, 'lit_tools_dir', None) + path = lit.getToolsPath(path, + config.environment['PATH'], + ['cmp.exe', 'grep.exe', 'sed.exe']) + if path is not None: + path = os.path.pathsep.join((path, + config.environment['PATH'])) + config.environment['PATH'] = path + # testFormat: The test format to use to interpret tests. -execute_external = (sys.platform in ['win32'] +execute_external = (not sys.platform in ['win32'] or lit.getBashPath() not in [None, ""]) config.test_format = lit.formats.ShTest(execute_external) @@ -29,18 +41,6 @@ config.excludes = ['Inputs'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) -# Tweak PATH for Win32 -if sys.platform in ['win32']: - # Seek sane tools in directories and set to $PATH. - path = getattr(config, 'lit_tools_dir', None) - path = lit.getToolsPath(path, - config.environment['PATH'], - ['cmp.exe', 'grep.exe', 'sed.exe']) - if path is not None: - path = os.path.pathsep.join((path, - config.environment['PATH'])) - config.environment['PATH'] = path - # test_exec_root: The root path where tests should be run. llvm_obj_root = getattr(config, 'llvm_obj_root', None) if llvm_obj_root is not None: |