From 24e44591c429fdba1f771e29b67d9239780f87d0 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Thu, 11 Oct 2018 17:38:51 +0900 Subject: [PATCH] Implement separate OS/2 codes comparing exe names with strcasecmp() --- googletest/test/googletest-options-test.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/googletest/test/googletest-options-test.cc b/googletest/test/googletest-options-test.cc index 66843eda..7a27a72b 100644 --- a/googletest/test/googletest-options-test.cc +++ b/googletest/test/googletest-options-test.cc @@ -94,18 +94,20 @@ 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 || GTEST_OS_OS2 +#if GTEST_OS_WINDOWS const bool success = _strcmpi("googletest-options-test", exe_str.c_str()) == 0 || _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || _strcmpi("gtest_all_test", exe_str.c_str()) == 0 || _strcmpi("gtest_dll_test", exe_str.c_str()) == 0; +#elif GTEST_OS_OS2 + const bool success = + strcasecmp("googletest-options-test", exe_str.c_str()) == 0 || + strcasecmp("gtest-options-ex_test", exe_str.c_str()) == 0 || + strcasecmp("gtest_all_test", exe_str.c_str()) == 0 || + strcasecmp("gtest_dll_test", exe_str.c_str()) == 0; #elif GTEST_OS_FUCHSIA const bool success = exe_str == "app"; #else