diff options
author | Gennadiy Civil <misterg@google.com> | 2018-03-15 18:31:37 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-03-15 18:31:37 (GMT) |
commit | a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b (patch) | |
tree | c0cdf002f62ce0af852a61777e009c9968ef806f /googletest/src | |
parent | a325ad2db5deb623eab740527e559b81c0f39d65 (diff) | |
download | googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.zip googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.gz googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.bz2 |
merge, again, IsRecursiveContainerrefs/pull/1507/head
Diffstat (limited to 'googletest/src')
-rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 74df549..d22679f 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -5185,8 +5185,8 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { // each TestCase and TestInfo object. // If shard_tests == true, further filters tests based on sharding // variables in the environment - see -// https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md . -// Returns the number of tests that should run. +// https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md +// . Returns the number of tests that should run. int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? Int32FromEnvOrDie(kTestTotalShards, -1) : -1; |