diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-19 13:43:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 13:43:22 -0500 |
| commit | b5b6a07d1422603ddb357166950d33fd9fb25f86 (patch) | |
| tree | f505b0ff7e0d96fb725221ddc8fe3441bcdb3cf3 /googletest/test/gtest_output_test_.cc | |
| parent | f6c44fe3180af1ae58d10681732d21f9505e04c2 (diff) | |
| parent | a37eedc3c15e57cea81722eea3f97b2aeb1659cf (diff) | |
| download | googletest-b5b6a07d1422603ddb357166950d33fd9fb25f86.tar.gz googletest-b5b6a07d1422603ddb357166950d33fd9fb25f86.tar.bz2 googletest-b5b6a07d1422603ddb357166950d33fd9fb25f86.zip | |
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
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 |