diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:47:14 +0200 |
| commit | c86fbd766b4d2e4b20ad7f2d6129f77452455f6e (patch) | |
| tree | 3d5f8698ddff82e59fbe579c7e8ee664388ae51b /googletest/test | |
| parent | aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.tar.gz googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.tar.bz2 googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest-param-test_test.cc | 4 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc index d1e9d60f..7d23e49e 100644 --- a/googletest/test/gtest-param-test_test.cc +++ b/googletest/test/gtest-param-test_test.cc @@ -855,8 +855,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {} INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, Values(std::string("LambdaName")), - [](const ::testing::TestParamInfo<std::string>& info) { - return info.param; + [](const ::testing::TestParamInfo<std::string>& tpinfo) { + return tpinfo.param; }); #endif // GTEST_LANG_CXX11 diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index f84def90..745c9506 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2096,7 +2096,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment { }; // This will test property recording outside of any test or test case. -static Environment* record_property_env = +Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ = AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment); // This group of tests is for predicate assertions (ASSERT_PRED*, etc) |