Merge pull request #2665 from bysreg:fix_noshortcircuitfailure_detectsflakyshortcircu...

PiperOrigin-RevId: 290256504

diff --cc googlemock/test/gmock-matchers_test.cc
index e6e8c8f402118c4b115a81a7304c7c8a42439e46,96ca8959bb3c66a88608318813d1fc761c9d57b9..c667ecbe3ad8c792bc07c13992fbef4002f7788c
--- 1/googlemock/test/gmock-matchers_test.cc
--- 2/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@@ -6885,7 -6885,7 +6885,8 @@@ TEST_F(PredicateFormatterFromMatcherTes
    EXPECT_FALSE(result);  // Implicit cast to bool.
    std::string expect =
        "Value of: dummy-name\nExpected: [DescribeTo]\n"
-       "  Actual: 1, [MatchAndExplain]";
 -      "  Actual: 1" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
++      "  Actual: 1" +
++      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
    EXPECT_EQ(expect, result.message());
  }
  
@@@ -6896,7 -6896,7 +6897,8 @@@ TEST_F(PredicateFormatterFromMatcherTes
        "Value of: dummy-name\nExpected: [DescribeTo]\n"
        "  The matcher failed on the initial attempt; but passed when rerun to "
        "generate the explanation.\n"
-       "  Actual: 2, [MatchAndExplain]";
 -      "  Actual: 2" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
++      "  Actual: 2" +
++      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
    EXPECT_EQ(expect, result.message());
  }