diff options
| author | Copybara-Service <copybara-worker@google.com> | 2023-06-06 19:04:10 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-06 19:04:10 (GMT) |
| commit | 334704df263b480a3e9e7441ed3292a5e30a37ec (patch) | |
| tree | 379c8c1885545897393219d03f3b49fba529d109 | |
| parent | 23f642ab2317c632d93326c65efd44671c1d9985 (diff) | |
| parent | 001f281926c74a819e9266bb4ec525515ff39418 (diff) | |
| download | googletest-334704df263b480a3e9e7441ed3292a5e30a37ec.zip googletest-334704df263b480a3e9e7441ed3292a5e30a37ec.tar.gz googletest-334704df263b480a3e9e7441ed3292a5e30a37ec.tar.bz2 | |
Merge pull request #4269 from elupus:patch-3
PiperOrigin-RevId: 538253216
Change-Id: Ib4bc90974f92939f884d6b5927f8bf37aac4d2c7
| -rw-r--r-- | googletest/src/gtest-internal-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h index 5ba557f..be82166 100644 --- a/googletest/src/gtest-internal-inl.h +++ b/googletest/src/gtest-internal-inl.h @@ -672,7 +672,7 @@ class GTEST_API_ UnitTestImpl { void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc, internal::TearDownTestSuiteFunc tear_down_tc, TestInfo* test_info) { -#ifdef GTEST_HAS_DEATH_TEST +#ifdef GTEST_HAS_FILE_SYSTEM // In order to support thread-safe death tests, we need to // remember the original working directory when the test program // was first invoked. We cannot do this in RUN_ALL_TESTS(), as @@ -685,7 +685,7 @@ class GTEST_API_ UnitTestImpl { GTEST_CHECK_(!original_working_dir_.IsEmpty()) << "Failed to get the current working directory."; } -#endif // GTEST_HAS_DEATH_TEST +#endif // GTEST_HAS_FILE_SYSTEM GetTestSuite(test_info->test_suite_name(), test_info->type_param(), set_up_tc, tear_down_tc) |