Unify preamble injection in AnalysisFramework
#14480
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cameel
force-pushed
the
refactor-preamble
branch
from
06b57bb to
4f70c74
Compare
nikola-matic
previously approved these changes
Aug 8, 2023
cameel
force-pushed
the
refactor-preamble
branch
from
4f70c74 to
633cb41
Compare
cameel
force-pushed
the
refactor-preamble
branch
from
633cb41 to
04fd8eb
Compare
r0qs
reviewed
Aug 10, 2023
cameel
force-pushed
the
refactor-preamble
branch
from
078754a to
b29778c
Compare
cameel
force-pushed
the
refactor-preamble
branch
from
b29778c to
49408be
Compare
| }; | ||
|
|
||
| string output = regex_replace(_stderrContent, preReleaseWarningRegex, ""); | ||
| return regex_replace(std::move(output), noOutputRegex, ""); |
There was a problem hiding this comment.
Would string::erase(string::find(preRealeaseWarning)) not work here (on a copy of course)?
There was a problem hiding this comment.
No, because there are optional bits in the string. I.e. the error code and some whitespace. I'd have to do the replacement with 4 variants of the string for that to work.
Also, this is just a minor test helper, so not much point in avoiding simple regexes here if using them makes the code simpler.
cameel
force-pushed
the
refactor-preamble
branch
from
49408be to
dbe12ff
Compare
cameel
force-pushed
the
refactor-preamble
branch
3 times, most recently
from
3d3d597 to
02ba1ed
Compare
matheusaaguiar
approved these changes
Aug 17, 2023
cameel
force-pushed
the
refactor-preamble
branch
from
02ba1ed to
2baf9d4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Another refactor before #14433.
Even though
AnalysisFrameworkcan insert preamble automatically, this code is baked intoparseAnalyseAndReturnError(), which is not universally used by all test cases. The result is that some test cases reinvent the wheel and implement that bit on their own, always slightly differently. Some of them do not insert license if it's already there, some don't care. Some can handle multi-line comments, some can't.This is quite frustrating because when you're writing a new test case you have to waste time to figure out why there are so many versions of it, which one you need and how to use it. Then you realize you can't easily reuse it and end up adding yet another copy. This PR unifies all that duplicated code into a reusable
withPreamble()method available to all test cases inheriting fromAnalysisFramework.It would be nice to also have the error filtering automatically adjust error locations to account for the preamble (
SyntaxTestalready has code for doing that), but I'll leave that for another day.