Merge pull request #4333 from ngie-eign:gtest_help_test-fix-FreeBSD
PiperOrigin-RevId: 557197748 Change-Id: I55b86353f5351bbcbdf8e6bca70e82d7383a5080
This commit is contained in:
commit
987e225614
@ -43,11 +43,22 @@ import sys
|
|||||||
from googletest.test import gtest_test_utils
|
from googletest.test import gtest_test_utils
|
||||||
|
|
||||||
|
|
||||||
|
FREEBSD = ('FreeBSD', 'GNU/kFreeBSD')
|
||||||
|
NETBSD = ('NetBSD',)
|
||||||
|
OPENBSD = ('OpenBSD',)
|
||||||
|
|
||||||
|
|
||||||
|
def is_bsd_based_os() -> bool:
|
||||||
|
"""Determine whether or not the OS is BSD-based."""
|
||||||
|
if os.name != 'posix':
|
||||||
|
return False
|
||||||
|
|
||||||
|
return os.uname()[0] in (FREEBSD + NETBSD + OPENBSD)
|
||||||
|
|
||||||
|
|
||||||
IS_DARWIN = os.name == 'posix' and os.uname()[0] == 'Darwin'
|
IS_DARWIN = os.name == 'posix' and os.uname()[0] == 'Darwin'
|
||||||
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
|
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
|
||||||
IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU'
|
IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU'
|
||||||
IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD'
|
|
||||||
IS_OPENBSD = os.name == 'posix' and os.uname()[0] == 'OpenBSD'
|
|
||||||
IS_WINDOWS = os.name == 'nt'
|
IS_WINDOWS = os.name == 'nt'
|
||||||
|
|
||||||
PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
|
PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
|
||||||
@ -133,7 +144,7 @@ class GTestHelpTest(gtest_test_utils.TestCase):
|
|||||||
|
|
||||||
self.assertTrue(HELP_REGEX.search(output), output)
|
self.assertTrue(HELP_REGEX.search(output), output)
|
||||||
|
|
||||||
if IS_DARWIN or IS_LINUX or IS_GNUHURD or IS_GNUKFREEBSD or IS_OPENBSD:
|
if IS_DARWIN or IS_LINUX or IS_GNUHURD or is_bsd_based_os():
|
||||||
self.assertIn(STREAM_RESULT_TO_FLAG, output)
|
self.assertIn(STREAM_RESULT_TO_FLAG, output)
|
||||||
else:
|
else:
|
||||||
self.assertNotIn(STREAM_RESULT_TO_FLAG, output)
|
self.assertNotIn(STREAM_RESULT_TO_FLAG, output)
|
||||||
|
Loading…
Reference in New Issue
Block a user