aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-02-13 13:49:57 -0500
committerGennadiy Civil <misterg@google.com>2018-02-13 13:49:57 -0500
commitab186a8c49a2939cd99565da009ae5c6230b3246 (patch)
treec02af971917388438831cdda1de409093e7d5ed0
parent30d276da03468d08bcde1820b6b9ed17e9fffbe6 (diff)
downloadgoogletest-ab186a8c49a2939cd99565da009ae5c6230b3246.tar.gz
googletest-ab186a8c49a2939cd99565da009ae5c6230b3246.tar.bz2
googletest-ab186a8c49a2939cd99565da009ae5c6230b3246.zip
merges
-rw-r--r--googletest/test/gtest-param-test_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc
index fb2e44b0..b21cb31f 100644
--- a/googletest/test/gtest-param-test_test.cc
+++ b/googletest/test/gtest-param-test_test.cc
@@ -893,8 +893,7 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameFunction,
class CustomLambdaNamingTest : public TestWithParam<std::string> {};
TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
-INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
- CustomLambdaNamingTest,
+INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest,
Values(std::string("LambdaName")),
[](const ::testing::TestParamInfo<std::string>& inf) {
return inf.param;