Report CHECK/DCHECK to test launcher summary output.

base/test/test_suite.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/test_suite.h"
 
 #include <memory>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 220 matching lines @@
 
   // Do not add the result printer if output path already exists. It's an
   // indicator there is a process printing to that file, and we're likely
   // its child. Do not clobber the results in that case.
   if (PathExists(output_path)) {
     LOG(WARNING) << "Test launcher output path " << output_path.AsUTF8Unsafe()
                  << " exists. Not adding test launcher result printer.";
     return;
   }
 
-  XmlUnitTestResultPrinter* printer = new XmlUnitTestResultPrinter;
-  CHECK(printer->Initialize(output_path));
+  printer_ = new XmlUnitTestResultPrinter;
+  CHECK(printer_->Initialize(output_path));
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
-  listeners.Append(printer);
+  listeners.Append(printer_);
 }
 
 // Don't add additional code to this method.  Instead add it to
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
 #if defined(OS_IOS)
   RunTestsFromIOSApp();
 #endif
 
 #if defined(OS_MACOSX)
@@ skipping 20 matching lines @@
   // objects use to remove themselves as observers.
   scoped_pool.Recycle();
 #endif
 
   Shutdown();
 
   return result;
 }
 
 // static
-void TestSuite::UnitTestAssertHandler(const std::string& str) {
+void TestSuite::UnitTestAssertHandler(const char* file,
+                                      int line,
+                                      const std::string& summary,
+                                      const std::string& stack_trace) {
 #if defined(OS_ANDROID)
   // Correlating test stdio with logcat can be difficult, so we emit this
   // helpful little hint about what was running.  Only do this for Android
   // because other platforms don't separate out the relevant logs in the same
   // way.
   const ::testing::TestInfo* const test_info =
       ::testing::UnitTest::GetInstance()->current_test_info();
   if (test_info) {
     LOG(ERROR) << "Currently running: " << test_info->test_case_name() << "."
                << test_info->name();
     fflush(stderr);
   }
 #endif  // defined(OS_ANDROID)
 
+  printer_->OnAssert(file, line, summary, summary + stack_trace);

[Paweł Hajdan Jr., 2017/02/13 17:17:24]

Why do we pass "summary + stack_trace" instead of just stack_trace?

[alex-ac, 2017/02/14 10:34:28]

XmlUnitTestResultPrinter inherits gtest format, where assert has summary and
message. In GTest, summary is just a logged text, and message is a logged text,
concatenated with stack trace of assert. I think it's better to use same format
for DCHECK/CHECK.

[Paweł Hajdan Jr., 2017/02/14 19:23:26]

Okay. Since this is not obvious, could you add a comment to the code?

[alex-ac, 2017/03/09 14:15:52]

Done.

+
   // The logging system actually prints the message before calling the assert
   // handler. Just exit now to avoid printing too many stack traces.
   _exit(1);
 }
 
 void TestSuite::SuppressErrorDialogs() {
 #if defined(OS_WIN)
   UINT new_flags = SEM_FAILCRITICALERRORS |
                    SEM_NOGPFAULTERRORBOX |
                    SEM_NOOPENFILEERRORBOX;
@@ skipping 41 matching lines @@
   // Make sure we run with high resolution timer to minimize differences
   // between production code and test code.
   Time::EnableHighResolutionTimer(true);
 #endif  // defined(OS_WIN)
 
   // In some cases, we do not want to see standard error dialogs.
   if (!debug::BeingDebugged() &&
       !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
     SuppressErrorDialogs();
     debug::SetSuppressDebugUI(true);
-    logging::SetLogAssertHandler(UnitTestAssertHandler);
+    assert_handler_ = logging::ScopedLogAssertHandler(
+        base::Bind(&TestSuite::UnitTestAssertHandler, base::Unretained(this)));
   }
 
   base::test::InitializeICUForTesting();
 
   // On the Mac OS X command line, the default locale is *_POSIX. In Chromium,
   // the locale is set via an OS X locale API and is never *_POSIX.
   // Some tests (such as those involving word break iterator) will behave
   // differently and fail if we use *POSIX locale. Setting it to en_US here
   // does not affect tests that explicitly overrides the locale for testing.
   // This can be an issue on all platforms other than Windows.
@@ skipping 26 matching lines @@
 
 void TestSuite::Shutdown() {
   base::debug::StopProfiling();
 
   // Clear the FeatureList that was created by Initialize().
   if (created_feature_list_)
     FeatureList::ClearInstanceForTesting();
 }
 
 }  // namespace base