Merge "Base: Hand complete log message to aborter" am: 0d762648d0 (6049a297) · Commits · e / os / android_system_core

base/logging.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,8 @@ LogMessage::~LogMessage() {
		msg[nl] = '\0';
		LogLine(data_->GetFile(), data_->GetLineNumber(), data_->GetId(),
		data_->GetSeverity(), &msg[i]);
		// Undo the zero-termination so we can give the complete message to the aborter.
		msg[nl] = '\n';
		i = nl + 1;
		}
		}

+24 −0

Original line number	Diff line number	Diff line
		@@ -606,3 +606,27 @@ TEST(logging, LOG_FATAL_NOOP_ABORTER) {

		ASSERT_DEATH({SuppressAbortUI(); LOG(FATAL) << "foobar";}, "foobar");
		}

		struct CountLineAborter {
		static void CountLineAborterFunction(const char* msg) {
		while (*msg != 0) {
		if (*msg == '\n') {
		newline_count++;
		}
		msg++;
		}
		}
		static size_t newline_count;
		};
		size_t CountLineAborter::newline_count = 0;

		TEST(logging, LOG_FATAL_ABORTER_MESSAGE) {
		CountLineAborter::newline_count = 0;
		android::base::SetAborter(CountLineAborter::CountLineAborterFunction);

		android::base::ScopedLogSeverity sls(android::base::ERROR);
		CapturedStderr cap;
		LOG(FATAL) << "foo\nbar";

		EXPECT_EQ(CountLineAborter::newline_count, 1U + 1U); // +1 for final '\n'.
		}