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

Fix 9 - googletest-options-test failure on OS/2

Browse Source
This commit is contained in:
KO Myung-Hun 2018-04-01 16:13:54 +09:00
parent 77e00c9c72
commit 8afebd353d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/src/gtest.cc
View File

@ -445,7 +445,7 @@ static ::std::vector<std::string> g_argvs;
FilePath GetCurrentExecutableName() { FilePath GetCurrentExecutableName() {
FilePath result; FilePath result;
#if GTEST_OS_WINDOWS #if GTEST_OS_WINDOWS || GTEST_OS_OS2
result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
#else #else
result.Set(FilePath(GetArgvs()[0])); result.Set(FilePath(GetArgvs()[0]));

6
googletest/test/googletest-options-test.cc
View File

@ -94,9 +94,13 @@ TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
#endif #endif
} }
#if GTEST_OS_OS2
# define _strcmpi strcasecmp
#endif
TEST(OutputFileHelpersTest, GetCurrentExecutableName) { TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
const std::string exe_str = GetCurrentExecutableName().string(); const std::string exe_str = GetCurrentExecutableName().string();
#if GTEST_OS_WINDOWS #if GTEST_OS_WINDOWS || GTEST_OS_OS2
const bool success = const bool success =
_strcmpi("googletest-options-test", exe_str.c_str()) == 0 || _strcmpi("googletest-options-test", exe_str.c_str()) == 0 ||
_strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||