From 8afebd353dc984dd4d052e5e82cfda8b60023cf6 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Sun, 1 Apr 2018 16:13:54 +0900 Subject: [PATCH] Fix 9 - googletest-options-test failure on OS/2 --- googletest/src/gtest.cc | 2 +- googletest/test/googletest-options-test.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index b0c9c979..8ae25722 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -445,7 +445,7 @@ static ::std::vector g_argvs; FilePath GetCurrentExecutableName() { FilePath result; -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS || GTEST_OS_OS2 result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); #else result.Set(FilePath(GetArgvs()[0])); diff --git a/googletest/test/googletest-options-test.cc b/googletest/test/googletest-options-test.cc index edd4eba3..66843eda 100644 --- a/googletest/test/googletest-options-test.cc +++ b/googletest/test/googletest-options-test.cc @@ -94,9 +94,13 @@ TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) { #endif } +#if GTEST_OS_OS2 +# define _strcmpi strcasecmp +#endif + TEST(OutputFileHelpersTest, GetCurrentExecutableName) { const std::string exe_str = GetCurrentExecutableName().string(); -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS || GTEST_OS_OS2 const bool success = _strcmpi("googletest-options-test", exe_str.c_str()) == 0 || _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||