Merge branch 'master' into v1.8.x
This commit is contained in:
commit
30d325023c
|
@ -38,6 +38,7 @@ install:
|
|||
- ps: |
|
||||
Write-Output "Compiler: $env:compiler"
|
||||
Write-Output "Generator: $env:generator"
|
||||
Write-Output "Env:Configuation: $env:configuration"
|
||||
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
|
||||
Write-Output "This is *NOT* a pull request build"
|
||||
} else {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
AC_INIT([Google C++ Mocking and Testing Frameworks],
|
||||
[1.8.0],
|
||||
[1.9.0],
|
||||
[googlemock@googlegroups.com],
|
||||
[googletest])
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user