summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-15 17:39:33 -0500
committerGennadiy Civil <misterg@google.com>2018-01-15 17:39:33 -0500
commit9195571c6952dc4c8b6059fc6c15157a1e50f623 (patch)
tree9596fa8bfdb79b9025ec2a7b8e81efa03e4c4802 /googletest
parent6d04de7419a722e382c0445db88a7f749f6087d6 (diff)
downloadgoogletest-9195571c6952dc4c8b6059fc6c15157a1e50f623.tar.gz
googletest-9195571c6952dc4c8b6059fc6c15157a1e50f623.zip
Reverting some changes, need to make the merge compile
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/gtest.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 8326fa5d..c6efae50 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -707,8 +707,9 @@ class GTEST_API_ TestInfo {
// Returns true iff this test will appear in the XML report.
bool is_reportable() const {
- // The XML report includes tests matching the filter, excluding those
- // run in other shards.
+ // The XML report includes tests matching the filter.
+ // In the future, we may trim tests that are excluded because of
+ - // sharding.
return matches_filter_;
}
OpenPOWER on IntegriCloud