Commit 30d32502 by Gennadiy Civil

Merge branch 'master' into v1.8.x

parents 792b475b cfe0ae86
...@@ -38,6 +38,7 @@ install: ...@@ -38,6 +38,7 @@ install:
- ps: | - ps: |
Write-Output "Compiler: $env:compiler" Write-Output "Compiler: $env:compiler"
Write-Output "Generator: $env:generator" Write-Output "Generator: $env:generator"
Write-Output "Env:Configuation: $env:configuration"
if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) { if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
Write-Output "This is *NOT* a pull request build" Write-Output "This is *NOT* a pull request build"
} else { } else {
......
AC_INIT([Google C++ Mocking and Testing Frameworks], AC_INIT([Google C++ Mocking and Testing Frameworks],
[1.8.0], [1.9.0],
[googlemock@googlegroups.com], [googlemock@googlegroups.com],
[googletest]) [googletest])
......
...@@ -2117,7 +2117,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment { ...@@ -2117,7 +2117,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment {
}; };
// This will test property recording outside of any test or test case. // 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); AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
// This group of tests is for predicate assertions (ASSERT_PRED*, etc) // This group of tests is for predicate assertions (ASSERT_PRED*, etc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment