Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
30d32502
Commit
30d32502
authored
Sep 13, 2018
by
Gennadiy Civil
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into v1.8.x
parents
792b475b
cfe0ae86
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
appveyor.yml
appveyor.yml
+1
-0
configure.ac
configure.ac
+1
-1
gtest_unittest.cc
googletest/test/gtest_unittest.cc
+1
-1
No files found.
appveyor.yml
View file @
30d32502
...
@@ -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 {
...
...
configure.ac
View file @
30d32502
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])
...
...
googletest/test/gtest_unittest.cc
View file @
30d32502
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment