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
7e73a7ae
Commit
7e73a7ae
authored
Jul 18, 2018
by
Gennadiy Civil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting and a link
parent
20ef7944
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
gmock-matchers.h
googlemock/include/gmock/internal/custom/gmock-matchers.h
+1
-1
gtest-port.h
googletest/include/gtest/internal/gtest-port.h
+1
-1
gtest.cc
googletest/src/gtest.cc
+1
-1
No files found.
googlemock/include/gmock/internal/custom/gmock-matchers.h
View file @
7e73a7ae
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
// ============================================================
// ============================================================
//
//
// Adds google3 callback support to CallableTraits.
// Adds google3 callback support to CallableTraits.
//
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
googletest/include/gtest/internal/gtest-port.h
View file @
7e73a7ae
...
@@ -1218,7 +1218,7 @@ class scoped_ptr {
...
@@ -1218,7 +1218,7 @@ class scoped_ptr {
// Defines RE.
// Defines RE.
#if GTEST_USES_PCRE
#if GTEST_USES_PCRE
using
::
RE
;
// if used, PCRE is injected by custom/gtest-port.h
#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
// A simple C++ wrapper for <regex.h>. It uses the POSIX Extended
// A simple C++ wrapper for <regex.h>. It uses the POSIX Extended
...
...
googletest/src/gtest.cc
View file @
7e73a7ae
...
@@ -5273,7 +5273,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
...
@@ -5273,7 +5273,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
// each TestCase and TestInfo object.
// each TestCase and TestInfo object.
// If shard_tests == true, further filters tests based on sharding
// If shard_tests == true, further filters tests based on sharding
// variables in the environment - see
// variables in the environment - see
// https://github.com/google/googletest/blob/master/googletest/docs/
advanced
.md
// https://github.com/google/googletest/blob/master/googletest/docs/
AdvancedGuide
.md
// . Returns the number of tests that should run.
// . Returns the number of tests that should run.
int
UnitTestImpl
::
FilterTests
(
ReactionToSharding
shard_tests
)
{
int
UnitTestImpl
::
FilterTests
(
ReactionToSharding
shard_tests
)
{
const
Int32
total_shards
=
shard_tests
==
HONOR_SHARDING_PROTOCOL
?
const
Int32
total_shards
=
shard_tests
==
HONOR_SHARDING_PROTOCOL
?
...
...
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