From 2539189c11a90767ff7cd5e24ed7eb6f534f7f13 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Sat, 22 Mar 2014 04:46:59 +0000
Subject: [PATCH] Revert r204493, "Make clang/test/lit.cfg pre-scan the RUN
 line looking for tool names,"

It was incompatible to standlalone clang build.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@204539 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/lit.cfg | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/test/lit.cfg b/test/lit.cfg
index 8d0ac80ebe..f7acb2f156 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -288,40 +288,6 @@ config.substitutions.append(
     (' %clang-cl ',
      """*** invalid substitution, use '%clang_cl'. ***""") )
 
-# For each occurrence of a clang tool name as its own word, replace it
-# with the full path to the build directory holding that tool.  This
-# ensures that we are testing the tools just built and not some random
-# tools that might happen to be in the user's PATH.
-# For example, don't match 'clang-check-' or '.clang-format'.
-# Regex assertions to reject neighbor hyphens/dots (seen in some tests).
-NoPreHyphenDot = r"(?<!(-|\.))"
-NoPostHyphenDot = r"(?!(-|\.))"
-
-for pattern in [r"\bFileCheck\b",
-                r"\bc-index-test\b",
-                NoPreHyphenDot + r"\bclang-check\b" + NoPostHyphenDot,
-                NoPreHyphenDot + r"\bclang-format\b" + NoPostHyphenDot,
-                # FIXME: Some clang test uses opt?
-                NoPreHyphenDot + r"\bopt\b" + NoPostHyphenDot,
-                # Handle these specially as they are strings searched
-                # for during testing.
-                r"\| \bcount\b",
-                r"\| \bnot\b"]:
-    # Extract the tool name from the pattern.  This relies on the tool
-    # name being surrounded by \b word match operators.  If the
-    # pattern starts with "| ", include it in the string to be
-    # substituted.
-    tool_match = re.match(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
-                          pattern)
-    tool_pipe = tool_match.group(2)
-    tool_name = tool_match.group(4)
-    tool_path = lit.util.which(tool_name, llvm_tools_dir)
-    if not tool_path:
-        # Warn, but still provide a substitution.
-        lit_config.note('Did not find ' + tool_name + ' in ' + llvm_tools_dir)
-        tool_path = llvm_tools_dir + '/' + tool_name
-    config.substitutions.append((pattern, tool_pipe + tool_path))
-
 ###
 
 # Set available features we allow tests to conditionalize on.
-- 
2.40.0