diff options
author | KO Myung-Hun <komh@chollian.net> | 2018-10-11 17:29:33 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-10-11 17:31:25 (GMT) |
commit | b3b19a796cbb3222fb3a49daf3f0a9378e8505ad (patch) | |
tree | 3ca3d9b5d3ab6e5cf9d9562529dd2412a2dde141 /googletest/test/gtest_test_utils.py | |
parent | f203b2db77161fe54846ea9e839ebec81aeeccac (diff) | |
download | googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.zip googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.gz googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.bz2 |
Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77161fe54846ea9e839ebec81aeeccac
Closes #1899
PiperOrigin-RevId: 216719020
Diffstat (limited to 'googletest/test/gtest_test_utils.py')
-rwxr-xr-x | googletest/test/gtest_test_utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
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): |