[libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches Stricter #77721
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
Rather than allow for a message to be considered a match for the actual assertion if it is anywhere in the assertion text, make sure that the expected and the actual assertion are identical.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Will Hawkins (hawkinsw) ChangesRather than allow for a message to be considered a match for the actual assertion if it is anywhere in the assertion text, make sure that the expected and the actual assertion are identical. Addresses #77701 Full diff: https://github.com/llvm/llvm-project/pull/77721.diff 1 Files Affected:
diff --git a/libcxx/test/support/check_assertion.h b/libcxx/test/support/check_assertion.h
index 98dd95b11556e6..01e296d9138d0c 100644
--- a/libcxx/test/support/check_assertion.h
+++ b/libcxx/test/support/check_assertion.h
@@ -89,8 +89,7 @@ struct AssertionInfoMatcher {
std::size_t found_at = got_msg.find(msg_);
if (found_at == std::string_view::npos)
return false;
- // Allow any match
- return true;
+ return found_at == 0 && got_msg.size() == msg_.size();
}
private:
bool is_empty_;
|
|
Please feel free to ignore this change if it is unwanted. The tests that I ran locally all seem to pass with the stricter checking. I'll wait to see what it looks like on a full run of CI. |
…tricter Fix a few locations where matches were not precise.
mordante
requested changes
Jan 11, 2024
ldionne
approved these changes
Jan 11, 2024
…tricter Remove unrelated change.
|
Asking for another review from @mordante just out of caution! |
|
Pinging @var-const given his work on #77883. I will wait for his "go" before moving forward. |
justinfargnoli
pushed a commit
to justinfargnoli/llvm-project
that referenced
this pull request
Jan 28, 2024
…llvm#77721) Rather than allow for a message to be considered a match for the actual assertion if it is anywhere in the assertion text, make sure that the expected and the actual assertion are identical. Addresses llvm#77701
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.
Rather than allow for a message to be considered a match for the actual assertion if it is anywhere in the assertion text, make sure that the expected and the actual assertion are identical.
Addresses #77701