diff options
author | Fabrice de Gans-Riberi <fdegans@chromium.org> | 2018-05-03 19:06:45 (GMT) |
---|---|---|
committer | Fabrice de Gans-Riberi <fdegans@chromium.org> | 2018-05-03 19:06:45 (GMT) |
commit | 13af91faff5aaec0a622601713bc4f8b89a8e108 (patch) | |
tree | 801dcc3e17c738755473ee65b0d13a4803d62c74 /googletest/test/gtest-port_test.cc | |
parent | 96c3c422ad1e1bd06da37e88cdd8e200b812f8f3 (diff) | |
download | googletest-13af91faff5aaec0a622601713bc4f8b89a8e108.zip googletest-13af91faff5aaec0a622601713bc4f8b89a8e108.tar.gz googletest-13af91faff5aaec0a622601713bc4f8b89a8e108.tar.bz2 |
Fix more stuff and get tests to pass
Diffstat (limited to 'googletest/test/gtest-port_test.cc')
-rw-r--r-- | googletest/test/gtest-port_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest-port_test.cc b/googletest/test/gtest-port_test.cc index 51956f0..3801e5e 100644 --- a/googletest/test/gtest-port_test.cc +++ b/googletest/test/gtest-port_test.cc @@ -296,7 +296,7 @@ TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) { EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); } -#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX +#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA void* ThreadFunc(void* data) { internal::Mutex* mutex = static_cast<internal::Mutex*>(data); mutex->Lock(); @@ -340,7 +340,7 @@ TEST(GetThreadCountTest, ReturnsCorrectValue) { TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) { EXPECT_EQ(0U, GetThreadCount()); } -#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX +#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { const bool a_false_condition = false; |