diff options
| -rw-r--r-- | test/lit.cfg | 12 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 5dec8ff477..13986a069b 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -8,6 +8,18 @@ import platform # name: The name of this test suite. config.name = 'Clang' +# Tweak PATH for Win32 +if platform.system() == 'Windows': + # 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. # # For now we require '&&' between commands, until they get globally killed and diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 0d452ef6b5..df90b81055 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -4,6 +4,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" +config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.clang_obj_root = "@CLANG_BINARY_DIR@" config.target_triple = "@TARGET_TRIPLE@" |