Merge pull request #4164 from sergio-nsk:patch-2
PiperOrigin-RevId: 512753220 Change-Id: I3f7ad6c62c738d1d7405c50924b36deac8a9ac85
This commit is contained in:
commit
c7d0bc8309
@ -5409,6 +5409,8 @@ int UnitTest::Run() {
|
|||||||
in_death_test_child_process
|
in_death_test_child_process
|
||||||
? nullptr
|
? nullptr
|
||||||
: internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
|
: internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
|
||||||
|
#else
|
||||||
|
const bool in_death_test_child_process = false;
|
||||||
#endif // GTEST_HAS_DEATH_TEST
|
#endif // GTEST_HAS_DEATH_TEST
|
||||||
|
|
||||||
// Captures the value of GTEST_FLAG(catch_exceptions). This value will be
|
// Captures the value of GTEST_FLAG(catch_exceptions). This value will be
|
||||||
@ -5456,6 +5458,8 @@ int UnitTest::Run() {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void)in_death_test_child_process; // Needed inside the #if block above
|
||||||
#endif // GTEST_OS_WINDOWS
|
#endif // GTEST_OS_WINDOWS
|
||||||
|
|
||||||
return internal::HandleExceptionsInMethodIfSupported(
|
return internal::HandleExceptionsInMethodIfSupported(
|
||||||
|
Loading…
Reference in New Issue
Block a user