diff options
| author | misterg <misterg@google.com> | 2019-02-04 18:03:10 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-04 19:19:58 (GMT) |
| commit | 50059a12b9fdcd4d8d7b5e5670474225daf31ed3 (patch) | |
| tree | 9aaa90b55f291a787928aebec6dddafe16df9f58 /googletest/test | |
| parent | 52ea4f7beaa6e05a52ded6b04a73b7eadbc09996 (diff) | |
| download | googletest-50059a12b9fdcd4d8d7b5e5670474225daf31ed3.zip googletest-50059a12b9fdcd4d8d7b5e5670474225daf31ed3.tar.gz googletest-50059a12b9fdcd4d8d7b5e5670474225daf31ed3.tar.bz2 | |
Googletest export
Address -Wgnu-zero-variadic-macro-arguments
Originally in OSS PR #2063 https://github.com/google/googletest/pull/2063
Fix regression in INSTANTIATE_TEST_SUITE_P macro to accept function pointers properly.
PiperOrigin-RevId: 232316698
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-param-test-test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/googletest/test/googletest-param-test-test.cc b/googletest/test/googletest-param-test-test.cc index 626c1b9..2ab9b1b 100644 --- a/googletest/test/googletest-param-test-test.cc +++ b/googletest/test/googletest-param-test-test.cc @@ -853,6 +853,10 @@ INSTANTIATE_TEST_SUITE_P(CustomParamNameFunction, CustomFunctionNamingTest, Values(std::string("FunctionName")), CustomParamNameFunction); +INSTANTIATE_TEST_SUITE_P(CustomParamNameFunctionP, CustomFunctionNamingTest, + Values(std::string("FunctionNameP")), + &CustomParamNameFunction); + // Test custom naming with a lambda class CustomLambdaNamingTest : public TestWithParam<std::string> {}; @@ -878,6 +882,7 @@ TEST(CustomNamingTest, CheckNameRegistry) { } EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName")); EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName")); + EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionNameP")); EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName")); } |