diff options
| author | CJ Johnson <johnsoncj@google.com> | 2021-06-17 16:52:18 (GMT) |
|---|---|---|
| committer | CJ Johnson <johnsoncj@google.com> | 2021-06-17 16:52:18 (GMT) |
| commit | 22a2e019c47322e1b43973e77293d7ecbb7f40b7 (patch) | |
| tree | 6fd21a384ab88751540f286a7ee556dd4f2cff55 /googletest/test | |
| parent | 996328bb8eeea7e3b824a7cf4c156640600d9778 (diff) | |
| parent | 05e9fa23f74a4766294f858c16e87a1560261340 (diff) | |
| download | googletest-22a2e019c47322e1b43973e77293d7ecbb7f40b7.zip googletest-22a2e019c47322e1b43973e77293d7ecbb7f40b7.tar.gz googletest-22a2e019c47322e1b43973e77293d7ecbb7f40b7.tar.bz2 | |
Merge pull request #3200 from ellert:port-to-GNU/Hurd
PiperOrigin-RevId: 379383941
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-port-test.cc | 2 | ||||
| -rwxr-xr-x | googletest/test/gtest_help_test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 1e0c861..2697355 100644 --- a/googletest/test/googletest-port-test.cc +++ b/googletest/test/googletest-port-test.cc @@ -280,7 +280,7 @@ TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) { #if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \ GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ - GTEST_OS_NETBSD || GTEST_OS_OPENBSD + GTEST_OS_NETBSD || GTEST_OS_OPENBSD || GTEST_OS_GNU_HURD void* ThreadFunc(void* data) { internal::Mutex* mutex = static_cast<internal::Mutex*>(data); mutex->Lock(); diff --git a/googletest/test/gtest_help_test.py b/googletest/test/gtest_help_test.py index 8d953bb..54d4504 100755 --- a/googletest/test/gtest_help_test.py +++ b/googletest/test/gtest_help_test.py @@ -43,6 +43,7 @@ import gtest_test_utils IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' +IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU' IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD' IS_WINDOWS = os.name == 'nt' @@ -112,7 +113,7 @@ class GTestHelpTest(gtest_test_utils.TestCase): self.assertEquals(0, exit_code) self.assert_(HELP_REGEX.search(output), output) - if IS_LINUX or IS_GNUKFREEBSD: + if IS_LINUX or IS_GNUHURD or IS_GNUKFREEBSD: self.assert_(STREAM_RESULT_TO_FLAG in output, output) else: self.assert_(STREAM_RESULT_TO_FLAG not in output, output) |