diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-13 10:42:21 (GMT) |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-13 10:42:21 (GMT) |
| commit | 3280099951c51b7d2745bd840f2dd9d967cffcda (patch) | |
| tree | 3f76ba85031bac42ebc77f99c49d48ae480964bb /googletest/test/gtest-options_test.cc | |
| parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
| parent | 08d5b1f33af8c18785fb8ca02792b5fac81e248f (diff) | |
| download | googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.zip googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.tar.gz googletest-3280099951c51b7d2745bd840f2dd9d967cffcda.tar.bz2 | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googletest/test/gtest-options_test.cc')
| -rw-r--r-- | googletest/test/gtest-options_test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/googletest/test/gtest-options_test.cc b/googletest/test/gtest-options_test.cc index 25c9f39..10cb1df 100644 --- a/googletest/test/gtest-options_test.cc +++ b/googletest/test/gtest-options_test.cc @@ -103,6 +103,8 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || _strcmpi("gtest_all_test", exe_str.c_str()) == 0 || _strcmpi("gtest_dll_test", exe_str.c_str()) == 0; +#elif GTEST_OS_FUCHSIA + const bool success = exe_str == "app"; #else // TODO(wan@google.com): remove the hard-coded "lt-" prefix when // Chandler Carruth's libtool replacement is ready. @@ -116,6 +118,8 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { FAIL() << "GetCurrentExecutableName() returns " << exe_str; } +#if !GTEST_OS_FUCHSIA + class XmlOutputChangeDirTest : public Test { protected: virtual void SetUp() { @@ -202,6 +206,8 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) { #endif } +#endif // !GTEST_OS_FUCHSIA + } // namespace } // namespace internal } // namespace testing |