diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-22 20:20:19 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-22 20:20:19 (GMT) |
| commit | f1c87ad9f518b86a1efc2a68f452aaf53b899bfe (patch) | |
| tree | 897bbdf0751bea610e69771c54cd2e74b8510883 /googletest/src | |
| parent | 9bc86661f86a5c946f9e0a29ea2e34c8a9897d6b (diff) | |
| download | googletest-f1c87ad9f518b86a1efc2a68f452aaf53b899bfe.zip googletest-f1c87ad9f518b86a1efc2a68f452aaf53b899bfe.tar.gz googletest-f1c87ad9f518b86a1efc2a68f452aaf53b899bfe.tar.bz2 | |
merges, cl/155419551 and other
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 723d905..3435f9c 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -4813,10 +4813,11 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) && matches_filter; - const bool is_selected = is_runnable && - (shard_tests == IGNORE_SHARDING_PROTOCOL || - ShouldRunTestOnShard(total_shards, shard_index, - num_runnable_tests)); + const bool is_in_another_shard = + shard_tests != IGNORE_SHARDING_PROTOCOL && + !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests); + test_info->is_in_another_shard_ = is_in_another_shard; + const bool is_selected = is_runnable && !is_in_another_shard; num_runnable_tests += is_runnable; num_selected_tests += is_selected; |