Unverified Commit 7f11b9ff authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4

Googletest export
parents 1d9a1912 87494afc
...@@ -2679,9 +2679,9 @@ void TestInfo::Run() { ...@@ -2679,9 +2679,9 @@ void TestInfo::Run() {
factory_, &internal::TestFactoryBase::CreateTest, factory_, &internal::TestFactoryBase::CreateTest,
"the test fixture's constructor"); "the test fixture's constructor");
// Runs the test only if the test object was created and its // Runs the test if the constructor didn't generate a fatal failure.
// constructor didn't generate a fatal failure. // Note that the object will not be null
if ((test != NULL) && !Test::HasFatalFailure()) { if (!Test::HasFatalFailure()) {
// This doesn't throw as all user code that can throw are wrapped into // This doesn't throw as all user code that can throw are wrapped into
// exception handling code. // exception handling code.
test->Run(); test->Run();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment