coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8927610cac02042ef63d1327d491e304d0a2e190 into 1b96fa13f549387b7549cc89e1a785cf143a1a50

Browse Source
This commit is contained in:
TTPO100AJIEX 2025-11-12 16:13:26 +03:00 committed by GitHub
commit d76b027b1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
googletest/include/gtest/gtest-spi.h
View File

@ -153,10 +153,10 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
static void Execute() { statement; } \ static void Execute() { statement; } \
}; \ }; \
::testing::TestPartResultArray gtest_failures; \ ::testing::TestPartResultArray gtest_failures; \
::testing::internal::SingleFailureChecker gtest_checker( \ const ::testing::internal::SingleFailureChecker gtest_checker( \
&gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \ &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \
{ \ { \
::testing::ScopedFakeTestPartResultReporter gtest_reporter( \ const ::testing::ScopedFakeTestPartResultReporter gtest_reporter( \
::testing::ScopedFakeTestPartResultReporter:: \ ::testing::ScopedFakeTestPartResultReporter:: \
INTERCEPT_ONLY_CURRENT_THREAD, \ INTERCEPT_ONLY_CURRENT_THREAD, \
&gtest_failures); \ &gtest_failures); \
@ -171,10 +171,10 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
static void Execute() { statement; } \ static void Execute() { statement; } \
}; \ }; \
::testing::TestPartResultArray gtest_failures; \ ::testing::TestPartResultArray gtest_failures; \
::testing::internal::SingleFailureChecker gtest_checker( \ const ::testing::internal::SingleFailureChecker gtest_checker( \
&gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \ &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \
{ \ { \
::testing::ScopedFakeTestPartResultReporter gtest_reporter( \ const ::testing::ScopedFakeTestPartResultReporter gtest_reporter( \
::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
&gtest_failures); \ &gtest_failures); \
GTestExpectFatalFailureHelper::Execute(); \ GTestExpectFatalFailureHelper::Execute(); \
@ -217,11 +217,11 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
#define EXPECT_NONFATAL_FAILURE(statement, substr) \ #define EXPECT_NONFATAL_FAILURE(statement, substr) \
do { \ do { \
::testing::TestPartResultArray gtest_failures; \ ::testing::TestPartResultArray gtest_failures; \
::testing::internal::SingleFailureChecker gtest_checker( \ const ::testing::internal::SingleFailureChecker gtest_checker( \
&gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \ &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
(substr)); \ (substr)); \
{ \ { \
::testing::ScopedFakeTestPartResultReporter gtest_reporter( \ const ::testing::ScopedFakeTestPartResultReporter gtest_reporter( \
::testing::ScopedFakeTestPartResultReporter:: \ ::testing::ScopedFakeTestPartResultReporter:: \
INTERCEPT_ONLY_CURRENT_THREAD, \ INTERCEPT_ONLY_CURRENT_THREAD, \
&gtest_failures); \ &gtest_failures); \
@ -234,11 +234,11 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ #define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
do { \ do { \
::testing::TestPartResultArray gtest_failures; \ ::testing::TestPartResultArray gtest_failures; \
::testing::internal::SingleFailureChecker gtest_checker( \ const ::testing::internal::SingleFailureChecker gtest_checker( \
&gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \ &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
(substr)); \ (substr)); \
{ \ { \
::testing::ScopedFakeTestPartResultReporter gtest_reporter( \ const ::testing::ScopedFakeTestPartResultReporter gtest_reporter( \
::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
&gtest_failures); \ &gtest_failures); \
if (::testing::internal::AlwaysTrue()) { \ if (::testing::internal::AlwaysTrue()) { \

2
googletest/include/gtest/internal/gtest-death-test-internal.h
View File

@ -229,7 +229,7 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \
} \ } \
if (gtest_dt != nullptr) { \ if (gtest_dt != nullptr) { \
std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \ const std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
switch (gtest_dt->AssumeRole()) { \ switch (gtest_dt->AssumeRole()) { \
case ::testing::internal::DeathTest::OVERSEE_TEST: \ case ::testing::internal::DeathTest::OVERSEE_TEST: \
if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \ if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \