Skip to content

GitLab

Commit ed1bf868 authored by Mattias Ellert's avatar Mattias Ellert
Browse files

Fix gtest-help-test failure on GNU/kFreeBSD

parent ca4b7c9f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
googletest/test/gtest_help_test.py
View file @ ed1bf868
...@@ -43,6 +43,7 @@ import gtest_test_utils ...@@ -43,6 +43,7 @@ import gtest_test_utils
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD'
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_')
...@@ -111,7 +112,7 @@ class GTestHelpTest(gtest_test_utils.TestCase): ...@@ -111,7 +112,7 @@ class GTestHelpTest(gtest_test_utils.TestCase):
self.assertEquals(0, exit_code) self.assertEquals(0, exit_code)
self.assert_(HELP_REGEX.search(output), output) self.assert_(HELP_REGEX.search(output), output)
if IS_LINUX: if IS_LINUX or IS_GNUKFREEBSD:
self.assert_(STREAM_RESULT_TO_FLAG in output, output) self.assert_(STREAM_RESULT_TO_FLAG in output, output)
else: else:
self.assert_(STREAM_RESULT_TO_FLAG not in output, output) self.assert_(STREAM_RESULT_TO_FLAG not in output, output)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment