diff options
| author | Johannes Doerfert <johannes@jdoerfert.de> | 2023-07-14 12:20:57 -0700 |
|---|---|---|
| committer | Johannes Doerfert <johannes@jdoerfert.de> | 2023-07-14 13:53:36 -0700 |
| commit | 5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72 (patch) | |
| tree | 85e77dc3c8437bd9ec19bdfbfac0a2f895f14506 /llvm/utils/UpdateTestChecks/common.py | |
| parent | 0dcc78a1a6d80c27e5b8824b820ba9441a90c7b8 (diff) | |
| download | llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.zip llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.tar.gz llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.tar.bz2 | |
Revert "[UTC] Adapt version matcher to glob CLANG_VENDOR"
This reverts commit 68f5d1be3d8f9b2ee2f25098203b24a32057b4e6 as it is
built on top of https://reviews.llvm.org/D148216 which is broken.
See also https://github.com/llvm/llvm-project/issues/63746
Diffstat (limited to 'llvm/utils/UpdateTestChecks/common.py')
| -rw-r--r-- | llvm/utils/UpdateTestChecks/common.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py index 6f81805..1cc139c 100644 --- a/llvm/utils/UpdateTestChecks/common.py +++ b/llvm/utils/UpdateTestChecks/common.py @@ -1575,16 +1575,17 @@ def filter_globals_according_to_preference( ] +# The capture group is kept as is, followed by a {{.*}} glob METADATA_FILTERS = [ - (r"(?<=\")(\w+ )?(\w+ version )[\d.]+(?: \([^)]+\))?", r"{{.*}}\2{{.*}}"), # preface with glob also, to capture optional CLANG_VENDOR - (r'(!DIFile\(filename: ".+", directory: )".+"', r"\1{{.*}}"), + r"(\w+ version )[\d.]+(?: \([^)]+\))?", + r'(!DIFile\(filename: ".+", directory: )".+"', ] -METADATA_FILTERS_RE = [(re.compile(f),r) for (f,r) in METADATA_FILTERS] +METADATA_FILTERS_RE = [re.compile(s) for s in METADATA_FILTERS] def filter_unstable_metadata(line): - for (f,replacement) in METADATA_FILTERS_RE: - line = f.sub(replacement, line) + for f in METADATA_FILTERS_RE: + line = f.sub(r"\1{{.*}}", line) return line |