summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKO Myung-Hun <komh@chollian.net>2018-10-11 17:29:33 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-11 17:31:25 (GMT)
commitb3b19a796cbb3222fb3a49daf3f0a9378e8505ad (patch)
tree3ca3d9b5d3ab6e5cf9d9562529dd2412a2dde141
parentf203b2db77161fe54846ea9e839ebec81aeeccac (diff)
downloadgoogletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.zip
googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.gz
googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.bz2
Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77161fe54846ea9e839ebec81aeeccac
Closes #1899 PiperOrigin-RevId: 216719020
-rw-r--r--googletest/include/gtest/internal/gtest-port-arch.h2
-rw-r--r--googletest/include/gtest/internal/gtest-port.h4
-rw-r--r--googletest/src/gtest-printers.cc2
-rw-r--r--googletest/src/gtest.cc2
-rw-r--r--googletest/test/googletest-filepath-test.cc2
-rw-r--r--googletest/test/googletest-options-test.cc6
-rwxr-xr-xgoogletest/test/gtest_test_utils.py3
7 files changed, 16 insertions, 5 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h
index 587ed5e..4f2b87b 100644
--- a/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/googletest/include/gtest/internal/gtest-port-arch.h
@@ -66,6 +66,8 @@
# else
# define GTEST_OS_WINDOWS_DESKTOP 1
# endif // _WIN32_WCE
+#elif defined __OS2__
+# define GTEST_OS_OS2 1
#elif defined __APPLE__
# define GTEST_OS_MAC 1
# if TARGET_OS_IPHONE
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index b0008b0..64bf67f 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -129,6 +129,7 @@
// GTEST_OS_NACL - Google Native Client (NaCl)
// GTEST_OS_NETBSD - NetBSD
// GTEST_OS_OPENBSD - OpenBSD
+// GTEST_OS_OS2 - OS/2
// GTEST_OS_QNX - QNX
// GTEST_OS_SOLARIS - Sun Solaris
// GTEST_OS_SYMBIAN - Symbian
@@ -681,7 +682,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// Determines whether the system compiler uses UTF-16 for encoding wide strings.
#define GTEST_WIDE_STRING_USES_UTF16_ \
- (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
+ (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || \
+ GTEST_OS_AIX || GTEST_OS_OS2)
// Determines whether test results can be streamed to a socket.
#if GTEST_OS_LINUX
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc
index 3c0e758..12e6dbb 100644
--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
@@ -348,7 +348,7 @@ void PrintTo(const wchar_t* s, ostream* os) {
*os << "NULL";
} else {
*os << ImplicitCast_<const void*>(s) << " pointing to ";
- PrintCharsAsStringTo(s, std::wcslen(s), os);
+ PrintCharsAsStringTo(s, wcslen(s), os);
}
}
#endif // wchar_t is native
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index b0c9c97..8ae2572 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -445,7 +445,7 @@ static ::std::vector<std::string> 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-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(), ':');
diff --git a/googletest/test/googletest-options-test.cc b/googletest/test/googletest-options-test.cc
index edd4eba..7a27a72 100644
--- a/googletest/test/googletest-options-test.cc
+++ b/googletest/test/googletest-options-test.cc
@@ -102,6 +102,12 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
_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
diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py
index 43cba8f..245dcb1 100755
--- a/googletest/test/gtest_test_utils.py
+++ b/googletest/test/gtest_test_utils.py
@@ -36,6 +36,7 @@ import sys
IS_WINDOWS = os.name == 'nt'
IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
+IS_OS2 = os.name == 'os2'
import atexit
import shutil
@@ -164,7 +165,7 @@ def GetTestExecutablePath(executable_name, build_dir=None):
path = os.path.abspath(os.path.join(build_dir or GetBuildDir(),
executable_name))
- if (IS_WINDOWS or IS_CYGWIN) and not path.endswith('.exe'):
+ if (IS_WINDOWS or IS_CYGWIN or IS_OS2) and not path.endswith('.exe'):
path += '.exe'
if not os.path.exists(path):