diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-09 19:48:06 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-09 19:48:06 (GMT) |
| commit | 9fce984a677020f2f3ab60f66f02b9edd363bb61 (patch) | |
| tree | fa8db54ac138619c4d936fe5223a5962c677991f | |
| parent | 23015249236e60b94b5010330ef687de43d2e923 (diff) | |
| download | googletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.zip googletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.tar.gz googletest-9fce984a677020f2f3ab60f66f02b9edd363bb61.tar.bz2 | |
wip, cleanups/merge
| -rw-r--r-- | googletest/build-aux/.keep | 0 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest.h | 5 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-filepath.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/googletest/build-aux/.keep b/googletest/build-aux/.keep deleted file mode 100644 index e69de29..0000000 --- a/googletest/build-aux/.keep +++ /dev/null diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 2ad5a0c..3261c91 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -359,7 +359,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg); // this for you. // // The only time you derive from Test is when defining a test fixture -// to be used a TEST_F. For example: +// to be used in a TEST_F. For example: // // class FooTest : public testing::Test { // protected: @@ -699,7 +699,7 @@ class GTEST_API_ TestInfo { // Returns true iff this test will appear in the XML report. bool is_reportable() const { - // For now, the XML report includes all tests matching the filter. + // The XML report includes all tests matching the filter. // In the future, we may trim tests that are excluded because of // sharding. return matches_filter_; @@ -1782,7 +1782,6 @@ template <typename T> class TestWithParam : public Test, public WithParamInterface<T> { }; - // Macros for indicating success/failure in test code. // ADD_FAILURE unconditionally adds a failure to the current test. diff --git a/googletest/include/gtest/internal/gtest-filepath.h b/googletest/include/gtest/internal/gtest-filepath.h index 7a13b4b..406597a 100644 --- a/googletest/include/gtest/internal/gtest-filepath.h +++ b/googletest/include/gtest/internal/gtest-filepath.h @@ -27,14 +27,13 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Author: keith.ray@gmail.com (Keith Ray) // // Google Test filepath utilities // // This header file declares classes and functions used internally by // Google Test. They are subject to change without notice. // -// This file is #included in <gtest/internal/gtest-internal.h>. +// This file is #included in gtest/internal/gtest-internal.h. // Do not include this header file separately! #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ |