Merge pull request #3090 from knutpett:working_dir_on_diskless
PiperOrigin-RevId: 341604408
This commit is contained in:
		@@ -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 {
 | 
				
			|||||||
      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  // GTEST_HAS_DEATH_TEST
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    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)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user