From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Wed, 9 Feb 2011 04:19:57 +0000 (+0000)
Subject: test: CMake: Be aware of LLVM_LIT_TOOLS_DIR.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98af1ac9945212b568e0794e2854761abb80804a;p=clang

test: CMake: Be aware of LLVM_LIT_TOOLS_DIR.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125178 91177308-0d34-0410-b5e6-96231b3b80d8
---

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@"