Minor cleanup related to my latest scheduler changes.

[oota-llvm.git] / test / lit.cfg

diff --git a/test/lit.cfg b/test/lit.cfg
index 7df27029bb08003e80422ae1eaa5c98917c2c3fe..98f72092e3121d71037e6a5ace6d1f3e24739a7e 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -4,7 +4,6 @@
 
 import os
 import sys
-import re
 
 # name: The name of this test suite.
 config.name = 'LLVM'
@@ -149,44 +148,6 @@ for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
     else:
         config.substitutions.append(('%' + sub, site_exp[sub]))
 
-# For each occurrence of an llvm 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.  Thus this list
-# includes every tool placed in $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
-# (llvm_tools_dir in lit parlance).
-                # Don't match 'bugpoint-'.
-for pattern in [r"\bbugpoint\b(?!-)",   r"\bclang\b",
-                r"\bedis\b",            r"\bgold\b",
-                r"\bllc\b",             r"\blli\b",
-                r"\bllvm-ar\b",         r"\bllvm-as\b",
-                r"\bllvm-bcanalyzer\b", r"\bllvm-config\b",
-                r"\bllvm-diff\b",       r"\bllvm-dis\b",
-                r"\bllvm-extract\b",    r"\bllvm-ld\b",
-                r"\bllvm-link\b",       r"\bllvm-mc\b",
-                r"\bllvm-nm\b",         r"\bllvm-prof\b",
-                r"\bllvm-ranlib\b",     r"\bllvm-shlib\b",
-                r"\bllvm-stub\b",       r"\bllvm2cpp\b",
-                # Don't match '-llvmc'.
-                r"(?<!-)\bllvmc\b",     r"\blto\b",
-                                        # Don't match '.opt', '-opt'
-                                        # or '^opt'.
-                r"\bmacho-dump\b",      r"(?<!\.|-|\^)\bopt\b",
-                r"\btblgen\b",          r"\bFileCheck\b",
-                r"\bFileUpdate\b",      r"\bc-index-test\b",
-                r"\bfpcmp\b",           r"\bllvm-PerfectShuffle\b",
-                # 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.
-    substitution = re.sub(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
-                          r"\2" + llvm_tools_dir + "/" + r"\4",
-                          pattern)
-    config.substitutions.append((pattern, substitution))
-
 excludes = []
 
 # Provide target_triple for use in XFAIL and XTARGET.