diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-05 16:09:17 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-05 16:09:17 -0400 |
| commit | fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 (patch) | |
| tree | 8ba4de15422544aa4995d4dc269c61167866b00e /googlemock/test/gmock-spec-builders_test.cc | |
| parent | 7e5f90d3780d553cb86771141fb81349f3a63508 (diff) | |
| download | googletest-fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.tar.gz googletest-fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.tar.bz2 googletest-fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71.zip | |
Merging gMock, 2
Diffstat (limited to 'googlemock/test/gmock-spec-builders_test.cc')
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index a7bf03e5..6001582a 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -748,7 +748,6 @@ TEST(ExpectCallSyntaxTest, WarningIsErrorWithFlag) { testing::GMOCK_FLAG(default_mock_behavior) = original_behavior; } - #endif // GTEST_HAS_STREAM_REDIRECTION // Tests the semantics of ON_CALL(). @@ -2691,7 +2690,6 @@ int gmock_main(int argc, char **argv) { int main(int argc, char **argv) { #endif // GMOCK_RENAME_MAIN testing::InitGoogleMock(&argc, argv); - // Ensures that the tests pass no matter what value of // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies. testing::GMOCK_FLAG(catch_leaked_mocks) = true; |