diff options
| author | Henry Schreiner <henryschreineriii@utexas.edu> | 2018-04-06 21:52:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 21:52:42 +0200 |
| commit | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (patch) | |
| tree | 94c682c872a8879cfe3a8a1abbb7f42395ca79a4 /googlemock/test/gmock-spec-builders_test.cc | |
| parent | b22e8dec408935a7f76420026a738eeb61f8af38 (diff) | |
| parent | 82febb8eafc0425601b0d46567dc66c7750233ff (diff) | |
| download | googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.gz googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.bz2 googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.zip | |
Merge branch 'master' into cleanup-cmake
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; |