Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
5eecadf6
Commit
5eecadf6
authored
Jan 09, 2018
by
Gennadiy Civil
Browse files
Revert one file
parent
9fce984a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
googletest/include/gtest/gtest.h
googletest/include/gtest/gtest.h
+3
-2
No files found.
googletest/include/gtest/gtest.h
View file @
5eecadf6
...
@@ -359,7 +359,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
...
@@ -359,7 +359,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
// this for you.
// this for you.
//
//
// The only time you derive from Test is when defining a test fixture
// The only time you derive from Test is when defining a test fixture
// to be used
in
a TEST_F. For example:
// to be used a TEST_F. For example:
//
//
// class FooTest : public testing::Test {
// class FooTest : public testing::Test {
// protected:
// protected:
...
@@ -699,7 +699,7 @@ class GTEST_API_ TestInfo {
...
@@ -699,7 +699,7 @@ 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
{
//
T
he XML report includes all tests matching the filter.
//
For now, t
he XML report includes all tests matching the filter.
// In the future, we may trim tests that are excluded because of
// In the future, we may trim tests that are excluded because of
// sharding.
// sharding.
return
matches_filter_
;
return
matches_filter_
;
...
@@ -1782,6 +1782,7 @@ template <typename T>
...
@@ -1782,6 +1782,7 @@ template <typename T>
class
TestWithParam
:
public
Test
,
public
WithParamInterface
<
T
>
{
class
TestWithParam
:
public
Test
,
public
WithParamInterface
<
T
>
{
};
};
// Macros for indicating success/failure in test code.
// Macros for indicating success/failure in test code.
// ADD_FAILURE unconditionally adds a failure to the current test.
// ADD_FAILURE unconditionally adds a failure to the current test.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment