Reverting some changes, need to make the merge compile
This commit is contained in:
		@@ -707,8 +707,9 @@ class GTEST_API_ TestInfo {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  // Returns true iff this test will appear in the XML report.
 | 
					  // Returns true iff this test will appear in the XML report.
 | 
				
			||||||
  bool is_reportable() const {
 | 
					  bool is_reportable() const {
 | 
				
			||||||
    // The XML report includes tests matching the filter, excluding those
 | 
					    // The XML report includes tests matching the filter.
 | 
				
			||||||
    // run in other shards.
 | 
					    // In the future, we may trim tests that are excluded because of
 | 
				
			||||||
 | 
					 -  // sharding.
 | 
				
			||||||
    return matches_filter_;
 | 
					    return matches_filter_;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user