Fix lit for builds under /opt
authorFrancisco Lopes da Silva <oblita@gmail.com>
Mon, 5 Jan 2015 19:59:24 +0000 (19:59 +0000)
committerFrancisco Lopes da Silva <oblita@gmail.com>
Mon, 5 Jan 2015 19:59:24 +0000 (19:59 +0000)
llvm-svn: 225196

clang/test/lit.cfg

index 70353c6..846a6e9 100644 (file)
@@ -306,14 +306,14 @@ tool_dirs = os.path.pathsep.join((clang_tools_dir, llvm_tools_dir))
 # For example, don't match 'clang-check-' or '.clang-format'.
 NoPreHyphenDot = r"(?<!(-|\.))"
 NoPostHyphenDot = r"(?!(-|\.))"
+NoPostBar = r"(?!(/|\\))"
 
 for pattern in [r"\bFileCheck\b",
                 r"\bc-index-test\b",
                 NoPreHyphenDot + r"\bclang-check\b" + NoPostHyphenDot,
                 NoPreHyphenDot + r"\bclang-format\b" + NoPostHyphenDot,
                 NoPreHyphenDot + r"\bclang-interpreter\b" + NoPostHyphenDot,
-                # FIXME: Some clang test uses opt?
-                NoPreHyphenDot + r"\bopt\b" + NoPostHyphenDot,
+                NoPreHyphenDot + r"\bopt\b" + NoPostBar + NoPostHyphenDot,
                 # Handle these specially as they are strings searched
                 # for during testing.
                 r"\| \bcount\b",