From ec5ad0f8698881ea99b2fcda8c244b876b334afe Mon Sep 17 00:00:00 2001
From: Jae Heon Lee <jaeheonlee@google.com>
Date: Mon, 7 May 2018 14:09:37 -0700
Subject: [PATCH 1/2] Fix the bug where ad_hoc_test_result() functions of
 UnitTest and TestCase objects would return failures registered at TestCase
 and UnitTest scopes, respectively.

---
 googletest/src/gtest.cc           | 12 ++++++++----
 googletest/test/gtest_unittest.cc | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 73e9bf86..4fcd9b53 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -5340,11 +5340,15 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
   return os_stack_trace_getter_;
 }
 
-// Returns the TestResult for the test that's currently running, or
-// the TestResult for the ad hoc test if no test is running.
+// Returns the most specific TestResult currently running.
 TestResult* UnitTestImpl::current_test_result() {
-  return current_test_info_ ?
-      &(current_test_info_->result_) : &ad_hoc_test_result_;
+  if (current_test_info_ != nullptr) {
+    return &current_test_info_->result_;
+  }
+  if (current_test_case_ != nullptr) {
+    return &current_test_case_->ad_hoc_test_result_;
+  }
+  return &ad_hoc_test_result_;
 }
 
 // Shuffles all test cases, and the tests within each test case,
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index 58995a4f..8dc89329 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7748,3 +7748,25 @@ TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) {
   EXPECT_FALSE(SkipPrefix("world!", &p));
   EXPECT_EQ(str, p);
 }
+
+// Tests ad_hoc_test_result().
+
+class AdHocTestResultTest : public testing::Test {
+ protected:
+  static void SetUpTestCase() {
+    FAIL() << "A failure happened inside SetUpTestCase().";
+  }
+};
+
+TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) {
+  const testing::TestResult& test_result = testing::UnitTest::GetInstance()
+                                               ->current_test_case()
+                                               ->ad_hoc_test_result();
+  EXPECT_TRUE(test_result.Failed());
+}
+
+TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) {
+  const testing::TestResult& test_result =
+      testing::UnitTest::GetInstance()->ad_hoc_test_result();
+  EXPECT_FALSE(test_result.Failed());
+}

From 18abd8f51281461fe4f29cc0e7c18e9ed0888c9f Mon Sep 17 00:00:00 2001
From: Jae Heon Lee <jaeheonlee@google.com>
Date: Wed, 9 May 2018 13:03:57 -0700
Subject: [PATCH 2/2] Use NULL instead of nullptr, for pre-C++11 builds.

---
 googletest/src/gtest.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 4fcd9b53..1b2aad24 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -5342,10 +5342,10 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
 
 // Returns the most specific TestResult currently running.
 TestResult* UnitTestImpl::current_test_result() {
-  if (current_test_info_ != nullptr) {
+  if (current_test_info_ != NULL) {
     return &current_test_info_->result_;
   }
-  if (current_test_case_ != nullptr) {
+  if (current_test_case_ != NULL) {
     return &current_test_case_->ad_hoc_test_result_;
   }
   return &ad_hoc_test_result_;