From d06442d47a5c4b55252ee396cd260eea68755273 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Sun, 1 Apr 2018 16:44:32 +0900 Subject: [PATCH] Fix 28 - googletest-break-on-failure-unittest failure on OS/2 This fixes failure of the following tests as well: 29 - googletest-catch-exceptions-test (Failed) 31 - googletest-env-var-test (Failed) 32 - googletest-filter-unittest (Failed) 33 - googletest-help-test (Failed) 35 - googletest-output-test (Failed) 36 - googletest-shuffle-test (Failed) 37 - googletest-throw-on-failure-test (Failed) 38 - googletest-uninitialized-test (Failed) --- googletest/test/gtest_test_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index 43cba8f4..245dcb10 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):