Merge e0a66700097df42f4daf920110c9bf8214cc89b3 into 1b96fa13f549387b7549cc89e1a785cf143a1a50

This commit is contained in:
Jeremy Nimmer 2025-11-12 14:15:49 -05:00 committed by GitHub
commit 9cece28a5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1344,13 +1344,13 @@ class NeverThrown {
expected_exception>::type>::type, \ expected_exception>::type>::type, \
std::exception>::value, \ std::exception>::value, \
const ::testing::internal::NeverThrown&, const std::exception&>::type \ const ::testing::internal::NeverThrown&, const std::exception&>::type \
e) { \ gtest_caught_exception) { \
gtest_msg.value = "Expected: " #statement \ gtest_msg.value = "Expected: " #statement \
" throws an exception of type " #expected_exception \ " throws an exception of type " #expected_exception \
".\n Actual: it throws "; \ ".\n Actual: it throws "; \
gtest_msg.value += GTEST_EXCEPTION_TYPE_(e); \ gtest_msg.value += GTEST_EXCEPTION_TYPE_(gtest_caught_exception); \
gtest_msg.value += " with description \""; \ gtest_msg.value += " with description \""; \
gtest_msg.value += e.what(); \ gtest_msg.value += gtest_caught_exception.what(); \
gtest_msg.value += "\"."; \ gtest_msg.value += "\"."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} }