diff options
| author | KO Myung-Hun <komh@chollian.net> | 2018-10-11 17:29:33 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-11 17:31:25 (GMT) |
| commit | b3b19a796cbb3222fb3a49daf3f0a9378e8505ad (patch) | |
| tree | 3ca3d9b5d3ab6e5cf9d9562529dd2412a2dde141 /googletest/test/googletest-filepath-test.cc | |
| parent | f203b2db77161fe54846ea9e839ebec81aeeccac (diff) | |
| download | googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.zip googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.gz googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.bz2 | |
Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77161fe54846ea9e839ebec81aeeccac
Closes #1899
PiperOrigin-RevId: 216719020
Diffstat (limited to 'googletest/test/googletest-filepath-test.cc')
| -rw-r--r-- | googletest/test/googletest-filepath-test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/googletest-filepath-test.cc b/googletest/test/googletest-filepath-test.cc index 37f02fb..72d1c44 100644 --- a/googletest/test/googletest-filepath-test.cc +++ b/googletest/test/googletest-filepath-test.cc @@ -80,7 +80,7 @@ TEST(GetCurrentDirTest, ReturnsCurrentDir) { const FilePath cwd = FilePath::GetCurrentDir(); posix::ChDir(original_dir.c_str()); -# if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS || GTEST_OS_OS2 // Skips the ":". const char* const cwd_without_drive = strchr(cwd.c_str(), ':'); |