Skip to content

[libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches Stricter #77721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hawkinsw merged 3 commits into from
Jan 12, 2024
Merged

[libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches Stricter #77721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ede4846
[libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches Stricter
hawkinsw Jan 11, 2024
0d572b2
fixup! [libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches S…
hawkinsw Jan 11, 2024
85ce641
fixup! [libc++][NFC] Make AssertionInfoMatcher::CheckMessageMatches S…
hawkinsw Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/test/libcxx/containers/views/mdspan/layout_left/assert.stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ int main(int, char**) {
{
std::layout_left::mapping<std::dextents<int, 3>> m{std::dextents<int, 3>{100, 100, 100}};

TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "invalid rank index");
TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "layout_left::mapping::stride(): invalid rank index");
}
return 0;
}
2 changes: 1 addition & 1 deletion libcxx/test/libcxx/containers/views/mdspan/layout_right/assert.stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ int main(int, char**) {
{
std::layout_right::mapping<std::dextents<int, 3>> m{std::dextents<int, 3>{100, 100, 100}};

TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "invalid rank index");
TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "layout_right::mapping::stride(): invalid rank index");
}
return 0;
}
2 changes: 1 addition & 1 deletion libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main(int, char**) {
std::layout_stride::mapping<std::dextents<int, 3>> m(
std::dextents<int, 3>(100, 100, 100), std::array<int, 3>{1, 100, 10000});

TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "invalid rank index");
TEST_LIBCPP_ASSERT_FAILURE(m.stride(4), "layout_stride::mapping::stride(): invalid rank index");
}
return 0;
}
3 changes: 1 addition & 2 deletions libcxx/test/support/check_assertion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down