Do not to perform RUN line substitution of llc if that's prefixed by a hypnen
authorEli Bendersky <eliben@google.com>
Fri, 14 Jun 2013 19:14:52 +0000 (19:14 +0000)
committerEli Bendersky <eliben@google.com>
Fri, 14 Jun 2013 19:14:52 +0000 (19:14 +0000)
(-llc), similarly to the way it was done for clang and llvmc.

This doesn't affect the upstream llvm tests but helps when developing custom
LLVM-based tools and testing them within the LLVM regression framework.

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

test/lit.cfg

index 8272e97c3856f89eba82d63e53eaf0a4a951c2f8..b22a038a19473e2a571f6df1f39e56a6c27c600b 100644 (file)
@@ -201,9 +201,14 @@ if os.pathsep == ';':
     pathext = os.environ.get('PATHEXT', '').split(';')
 else:
     pathext = ['']
+# Regex to reject matching a hyphen
+NOHYPHEN = r"(?<!-)"
+
 for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
                 r"\bgold\b",
-                r"\bllc\b",             r"\blli\b",
+                # Match llc but not -llc
+                NOHYPHEN + r"\bllc\b",
+                r"\blli\b",
                 r"\bllvm-ar\b",         r"\bllvm-as\b",
                 r"\bllvm-bcanalyzer\b", r"\bllvm-config\b",
                 r"\bllvm-cov\b",        r"\bllvm-diff\b",
@@ -214,8 +219,9 @@ for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
                 r"\bllvm-prof\b",       r"\bllvm-ranlib\b",
                 r"\bllvm-rtdyld\b",     r"\bllvm-shlib\b",
                 r"\bllvm-size\b",
-                # Don't match '-llvmc'.
-                r"(?<!-)\bllvmc\b",     r"\blto\b",
+                # Match llvmc but not -llvmc
+                NOHYPHEN + r"\bllvmc\b",
+                r"\blto\b",
                                         # Don't match '.opt', '-opt',
                                         # '^opt' or '/opt'.
                 r"\bmacho-dump\b",      r"(?<!\.|-|\^|/)\bopt\b",