diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-09-13 14:42:46 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-09-13 14:42:46 (GMT) |
| commit | 30d325023ceabf39563ce9be4d75d7b54ddbfe02 (patch) | |
| tree | 115a58ee7f0d567cf7a76d9046c890b51acd9360 /googletest | |
| parent | 792b475b9bd893dec0df22ba27f8e0cacf59ad65 (diff) | |
| parent | cfe0ae867857dad6d14ff72a2f02808086021f35 (diff) | |
| download | googletest-30d325023ceabf39563ce9be4d75d7b54ddbfe02.zip googletest-30d325023ceabf39563ce9be4d75d7b54ddbfe02.tar.gz googletest-30d325023ceabf39563ce9be4d75d7b54ddbfe02.tar.bz2 | |
Merge branch 'master' into v1.8.x
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index f7213fb..fa10224 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2117,7 +2117,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment { }; // This will test property recording outside of any test or test case. -static Environment* record_property_env = +static Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ = AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment); // This group of tests is for predicate assertions (ASSERT_PRED*, etc) |