merges

ab186a8c · Gennadiy Civil · 30d276da · ab186a8c
Commit ab186a8c authored Feb 13, 2018 by Gennadiy Civil
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

googletest/test/gtest-param-test_test.cc googletest/test/gtest-param-test_test.cc +1 -2

No files found.
--- 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;