From e5686bb18b52dc29312a7b79c3d6ca2c826c31ed Mon Sep 17 00:00:00 2001 From: Knut Petter Svendsen Date: Thu, 29 Oct 2020 16:47:10 +0100 Subject: [PATCH] Only save original working directory if death tests are enabled On a diskless system you cannot get the current directory. So if death tests are disabled anyway, there is no point trying to get current directory. Without this fix, running tests on diskless systems will fail, even when death tests are disabled. --- googletest/src/gtest-internal-inl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h index aef5571c..5f75f8b4 100644 --- a/googletest/src/gtest-internal-inl.h +++ b/googletest/src/gtest-internal-inl.h @@ -682,6 +682,7 @@ class GTEST_API_ UnitTestImpl { void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc, internal::TearDownTestSuiteFunc tear_down_tc, TestInfo* test_info) { +#if GTEST_HAS_DEATH_TEST // 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 @@ -694,6 +695,7 @@ class GTEST_API_ UnitTestImpl { GTEST_CHECK_(!original_working_dir_.IsEmpty()) << "Failed to get the current working directory."; } +#endif GetTestSuite(test_info->test_suite_name(), test_info->type_param(), set_up_tc, tear_down_tc)