Make the 'library' lines in tests use a substitution. #4278
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
chandlerc
reviewed
Sep 6, 2024
testing/file_test/file_test_base.cpp
Outdated
| static constexpr llvm::StringLiteral TestName = "[[@TEST_NAME]]"; | ||
| auto keyword = llvm::StringRef(*content).substr(keyword_pos); | ||
| if (keyword.starts_with(TestName)) { | ||
| keyword = TestName; |
There was a problem hiding this comment.
Curious why this is assigned here, it doesn't seem to be used?
zygoloid
reviewed
Sep 6, 2024
There was a problem hiding this comment.
@zygoloid - also curious if you think this will be a help with boiler plate by making it (much) more regular?
I think it'll make copy-pasting files within a split-file test easier. I think this would be a win (but a small one).
testing/file_test/file_test_base.cpp
Outdated
| // Replaces the content keywords. | ||
| // | ||
| // TEST_NAME is the only content keyword at present, but we do validate that | ||
| // other names |
There was a problem hiding this comment.
Has this change been pushed yet? (I don't see the updated file here.)
zygoloid
approved these changes
Sep 10, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Sep 10, 2024
Applies #4278 TEST_NAME substitution to tests. Note I've tried to structure commits as: 1. Do all the replacements. 2. autoupdate (nothing else) -- this shows incorrect updates. 3. Fix up manually, including autoupdates to get back to original output.
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.
This opens the door for replacing all
library ...lines in toolchain test files withlibrary "[[@TEST_NAME]]";. That's technically more typing in a lot of cases, but OTOH means we can just do some copy-paste boilerplate and stop carefully writing library names.Also cleans up the test setup, because it's getting messy. I'm trying to make it easier to see the divisions of tests and the output associated with them. StringSwitch looked like a way to do this, with a few edits to make it work nicely.