eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into v1.8.x

Browse Source
This commit is contained in:
Gennadiy Civil 2018-09-13 10:42:46 -04:00
commit 30d325023c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@ -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 {

2
configure.ac
View File

@ -1,5 +1,5 @@
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])

2
googletest/test/gtest_unittest.cc
View File

@ -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)