eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplifies gtest's implementation by using an existing API to get the original working directory.

Browse Source
This commit is contained in:
zhanyong.wan 2009-01-26 21:04:36 +00:00
parent 650d5bf3ba
commit a32fc79c9a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtest.cc
View File

@ -289,7 +289,6 @@ Mutex g_linked_ptr_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX);
// Application pathname gotten in InitGoogleTest. // Application pathname gotten in InitGoogleTest.
String g_executable_path; String g_executable_path;
String g_original_working_dir;
// Returns the current application's name, removing directory path if that // Returns the current application's name, removing directory path if that
// is present. // is present.
@ -328,7 +327,8 @@ String UnitTestOptions::GetAbsolutePathToOutputFile() {
const char* const colon = strchr(gtest_output_flag, ':'); const char* const colon = strchr(gtest_output_flag, ':');
if (colon == NULL) if (colon == NULL)
return String(internal::FilePath::ConcatPaths( return String(internal::FilePath::ConcatPaths(
internal::FilePath(g_original_working_dir), internal::FilePath(
UnitTest::GetInstance()->original_working_dir()),
internal::FilePath(kDefaultOutputFile)).ToString() ); internal::FilePath(kDefaultOutputFile)).ToString() );
internal::FilePath output_name(colon + 1); internal::FilePath output_name(colon + 1);
@ -338,8 +338,8 @@ String UnitTestOptions::GetAbsolutePathToOutputFile() {
// following logic for turning it into an absolute path is wrong. // following logic for turning it into an absolute path is wrong.
// Fix it. // Fix it.
output_name = internal::FilePath::ConcatPaths( output_name = internal::FilePath::ConcatPaths(
internal::FilePath(g_original_working_dir), internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
internal::FilePath(colon + 1)); internal::FilePath(colon + 1));
if (!output_name.IsDirectory()) if (!output_name.IsDirectory())
return output_name.ToString(); return output_name.ToString();
@ -3938,8 +3938,6 @@ void InitGoogleTestImpl(int* argc, CharType** argv) {
if (*argc <= 0) return; if (*argc <= 0) return;
internal::g_executable_path = internal::StreamableToString(argv[0]); internal::g_executable_path = internal::StreamableToString(argv[0]);
internal::g_original_working_dir =
internal::FilePath::GetCurrentDir().ToString();
#ifdef GTEST_HAS_DEATH_TEST #ifdef GTEST_HAS_DEATH_TEST
g_argvs.clear(); g_argvs.clear();