eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 28 - googletest-break-on-failure-unittest failure on OS/2

Browse Source 
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)
This commit is contained in:
KO Myung-Hun 2018-04-01 16:44:32 +09:00
parent 8afebd353d
commit d06442d47a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
googletest/test/gtest_test_utils.py
View File

@ -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):