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 47 matching lines @@
 #endif
 
 #if defined(OS_IOS)
 #include "base/test/test_support_ios.h"
 #endif
 
 namespace base {
 
 namespace {
 
+TestSuite* g_test_suite = nullptr;

[Paweł Hajdan Jr., 2017/01/27 17:19:44]

This shouldn't be needed now, right?

[alex-ac, 2017/02/11 20:12:20]

Done.

+
 class MaybeTestDisabler : public testing::EmptyTestEventListener {
  public:
   void OnTestStart(const testing::TestInfo& test_info) override {
     ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info))
         << "Probably the OS #ifdefs don't include all of the necessary "
            "platforms.\nPlease ensure that no tests have the MAYBE_ prefix "
            "after the code is preprocessed.";
   }
 };
 
@@ skipping 73 matching lines @@
   InitializeFromCommandLine(argc, argv);
   // Logging must be initialized before any thread has a chance to call logging
   // functions.
   InitializeLogging();
 }
 #endif  // defined(OS_WIN)
 
 TestSuite::~TestSuite() {
   if (initialized_command_line_)
     CommandLine::Reset();
+
+  g_test_suite = nullptr;
 }
 
 void TestSuite::InitializeFromCommandLine(int argc, char** argv) {
   initialized_command_line_ = CommandLine::Init(argc, argv);
   testing::InitGoogleTest(&argc, argv);
   testing::InitGoogleMock(&argc, argv);
 
 #if defined(OS_IOS)
   InitIOSRunHook(this, argc, argv);
 #endif
 }
 
 #if defined(OS_WIN)
 void TestSuite::InitializeFromCommandLine(int argc, wchar_t** argv) {
   // Windows CommandLine::Init ignores argv anyway.
   initialized_command_line_ = CommandLine::Init(argc, NULL);
   testing::InitGoogleTest(&argc, argv);
   testing::InitGoogleMock(&argc, argv);
 }
 #endif  // defined(OS_WIN)
 
 void TestSuite::PreInitialize() {
+  g_test_suite = this;
 #if defined(OS_WIN)
   testing::GTEST_FLAG(catch_exceptions) = false;
 #endif
   EnableTerminationOnHeapCorruption();
 #if defined(OS_LINUX) && defined(USE_AURA)
   // When calling native char conversion functions (e.g wrctomb) we need to
   // have the locale set. In the absence of such a call the "C" locale is the
   // default. In the gtk code (below) gtk_init() implicitly sets a locale.
   setlocale(LC_ALL, "");
 #endif  // defined(OS_LINUX) && defined(USE_AURA)
@@ skipping 38 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,
+                                      size_t message_start,
+                                      size_t stack_start,
+                                      const std::string& str) {
 #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)
 
+  std::string message = str.substr(message_start);
+  std::string summary;
+
+  summary = message.substr(0, stack_start - message_start);
+  printer_->OnAssert(file, line, summary, message);
+
   // 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