gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting some changes, need to make the merge compile

Browse Source
This commit is contained in:
Gennadiy Civil
2018-01-15 17:34:46 -05:00
parent 304be8f009
commit b9e297838d
2 changed files with 12 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
googletest/include/gtest/gtest.h
View File

@@ -687,9 +687,6 @@ class GTEST_API_ TestInfo {
// Returns the line where this test is defined.
int line() const { return location_.line; }
// Return true if this test should not be run because it's in another shard.
bool is_in_another_shard() const { return is_in_another_shard_; }
// Returns true if this test should run, that is if the test is not
// disabled (or it is disabled but the also_run_disabled_tests flag has
// been specified) and its full name matches the user-specified filter.
@@ -712,7 +709,7 @@ class GTEST_API_ TestInfo {
bool is_reportable() const {
// The XML report includes tests matching the filter, excluding those
// run in other shards.
return matches_filter_ && !is_in_another_shard_;
return matches_filter_;
}
// Returns the result of the test.