External/googletest
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2112 from knuto:pr/fix_null_pointer

Browse Source 
PiperOrigin-RevId: 233825166
This commit is contained in:
Gennadiy Civil 2019-02-13 17:04:08 -05:00
commit d850e14471
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
googletest/docs/advanced.md
View File

@ -2430,7 +2430,7 @@ could generate this report:
"failures": 1,
"errors": 0,
"time": "0.035s",
"timestamp": "2011-10-31T18:52:42Z"
"timestamp": "2011-10-31T18:52:42Z",
"name": "AllTests",
"testsuites": [
{
@ -2447,11 +2447,11 @@ could generate this report:
"classname": "",
"failures": [
{
"message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2",
"message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2",
"type": ""
},
{
"message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0",
"message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0",
"type": ""
}
]
@ -2463,7 +2463,7 @@ could generate this report:
"classname": ""
}
]
}
},
{
"name": "LogicTest",
"tests": 1,
@ -2517,4 +2517,3 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
running the tests.
**Availability**: Linux, Windows, Mac.

2
googletest/src/gtest.cc
View File

@ -2675,10 +2675,12 @@ void TestInfo::Run() {
test->Run();
}
if (test != nullptr) {
// Deletes the test object.
impl->os_stack_trace_getter()->UponLeavingGTest();
internal::HandleExceptionsInMethodIfSupported(
test, &Test::DeleteSelf_, "the test fixture's destructor");
}
result_.set_elapsed_time(internal::GetTimeInMillis() - start);