aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest_output_test_.cc
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-09-04 19:38:35 +0200
committerHerbert Thielen <thielen@hs-worms.de>2017-09-04 19:38:35 +0200
commitaa0b5458a1c33b40f813013f3a6bbb928f8a3d9f (patch)
tree6eb4fe206c161c0cefb998cec4bcd4a4033408ae /googletest/test/gtest_output_test_.cc
parent7c6353d29a147cad1c904bf2957fd4ca2befe135 (diff)
downloadgoogletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.gz
googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.tar.bz2
googletest-aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f.zip
remove GTEST_HAS_PARAM_TESTS
As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
-rw-r--r--googletest/test/gtest_output_test_.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc
index 1070a9f2..9f400c5a 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