diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-24 00:00:01 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-24 00:00:01 (GMT) |
commit | 7f11b9ffb5712e2889a74856caf7507bb5c90da1 (patch) | |
tree | 83974344e47119f9363ec654f67c1b839b510b80 | |
parent | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 (diff) | |
parent | 87494afca70c50e62d1915830169558d25ce67a5 (diff) | |
download | googletest-7f11b9ffb5712e2889a74856caf7507bb5c90da1.zip googletest-7f11b9ffb5712e2889a74856caf7507bb5c90da1.tar.gz googletest-7f11b9ffb5712e2889a74856caf7507bb5c90da1.tar.bz2 |
Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
-rw-r--r-- | googletest/src/gtest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 888ffd1..e9127a1 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2679,18 +2679,18 @@ void TestInfo::Run() { factory_, &internal::TestFactoryBase::CreateTest, "the test fixture's constructor"); - // Runs the test only if the test object was created and its - // constructor didn't generate a fatal failure. - if ((test != NULL) && !Test::HasFatalFailure()) { + // Runs the test if the constructor didn't generate a fatal failure. + // Note that the object will not be null + if (!Test::HasFatalFailure()) { // This doesn't throw as all user code that can throw are wrapped into // exception handling code. test->Run(); } - // Deletes the test object. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - test, &Test::DeleteSelf_, "the test fixture's destructor"); + // 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); |