summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-02-13 22:04:08 (GMT)
committerGennadiy Civil <misterg@google.com>2019-02-13 22:04:09 (GMT)
commitd850e144710e330070b756c009749dc7a7302301 (patch)
tree1c0372bcda065b6cc74b516b1073ea38a02cfeac
parent54ec41f000189e89c5cfa8b115c6512cfdc0a21b (diff)
parent48e6f1f387e6e67489d7b1422239c1be637006cb (diff)
downloadgoogletest-d850e144710e330070b756c009749dc7a7302301.zip
googletest-d850e144710e330070b756c009749dc7a7302301.tar.gz
googletest-d850e144710e330070b756c009749dc7a7302301.tar.bz2
Merge pull request #2112 from knuto:pr/fix_null_pointer
PiperOrigin-RevId: 233825166
-rw-r--r--googletest/docs/advanced.md9
-rw-r--r--googletest/src/gtest.cc2
2 files changed, 6 insertions, 5 deletions
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index acb7f24..ea9b80f 100644
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -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.
-
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index d1cfb53..1d41692 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -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);