Skip to content

G
googletest
Commit e5686bb1 by Knut Petter Svendsen Committed by Knut Petter Svendsen
Options

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.
parent 3005672d
Showing with 2 additions and 0 deletions
googletest/src/gtest-internal-inl.h
...@@ -682,6 +682,7 @@ class GTEST_API_ UnitTestImpl { ...@@ -682,6 +682,7 @@ class GTEST_API_ UnitTestImpl {
void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc, void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
internal::TearDownTestSuiteFunc tear_down_tc, internal::TearDownTestSuiteFunc tear_down_tc,
TestInfo* test_info) { TestInfo* test_info) {
#if GTEST_HAS_DEATH_TEST
// In order to support thread-safe death tests, we need to // In order to support thread-safe death tests, we need to
// remember the original working directory when the test program // remember the original working directory when the test program
// was first invoked. We cannot do this in RUN_ALL_TESTS(), as // was first invoked. We cannot do this in RUN_ALL_TESTS(), as
...@@ -694,6 +695,7 @@ class GTEST_API_ UnitTestImpl { ...@@ -694,6 +695,7 @@ class GTEST_API_ UnitTestImpl {
GTEST_CHECK_(!original_working_dir_.IsEmpty()) GTEST_CHECK_(!original_working_dir_.IsEmpty())
<< "Failed to get the current working directory."; << "Failed to get the current working directory.";
} }
#endif
GetTestSuite(test_info->test_suite_name(), test_info->type_param(), GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
set_up_tc, tear_down_tc) set_up_tc, tear_down_tc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment