diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2017-12-31 00:55:13 +0000 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2017-12-31 00:55:13 +0000 |
| commit | 555e6e79485151cf8c8ada55d57d9ed872591dc5 (patch) | |
| tree | 650349af9faea6b83683373c4ef25af0b021134e /googletest/test/gtest_output_test_.cc | |
| parent | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (diff) | |
| parent | 5490beb0602eab560fa3969a4410e11d94bf12af (diff) | |
| download | googletest-555e6e79485151cf8c8ada55d57d9ed872591dc5.tar.gz googletest-555e6e79485151cf8c8ada55d57d9ed872591dc5.tar.bz2 googletest-555e6e79485151cf8c8ada55d57d9ed872591dc5.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
| -rw-r--r-- | googletest/test/gtest_output_test_.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc index e5fa764e..0856cc7c 100644 --- a/googletest/test/gtest_output_test_.cc +++ b/googletest/test/gtest_output_test_.cc @@ -757,8 +757,6 @@ TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) { // This #ifdef block tests the output of value-parameterized tests. -#if GTEST_HAS_PARAM_TEST - std::string ParamNameFunc(const testing::TestParamInfo<std::string>& info) { return info.param; } @@ -779,8 +777,6 @@ INSTANTIATE_TEST_CASE_P(PrintingStrings, testing::Values(std::string("a")), ParamNameFunc); -#endif // GTEST_HAS_PARAM_TEST - // This #ifdef block tests the output of typed tests. #if GTEST_HAS_TYPED_TEST |