am ad806908: am 755df295: Merge "logd: test: disable kernel LOGGER"

* commit 'ad806908bb68a03d34bc0bda3ad83abe321021a1':
  logd: test: disable kernel LOGGER
This commit is contained in:
Mark Salyzyn 2014-07-12 19:36:58 +00:00 committed by Android Git Automerger
commit 7fc37b5425

View file

@ -503,13 +503,11 @@ TEST(logd, both) {
(user_logger_content) ? yes : no,
(kernel_logger_available) ? yes : no,
(kernel_logger_content) ? yes : no,
(user_logger_available && kernel_logger_available) ? "WARNING" : "ok",
(user_logger_available && kernel_logger_available) ? "ERROR" : "ok",
(user_logger_content && kernel_logger_content) ? "ERROR" : "ok");
if (user_logger_available && kernel_logger_available) {
printf("WARNING: kernel & user logger; both consuming resources!!!\n");
}
EXPECT_EQ(0, user_logger_available && kernel_logger_available);
EXPECT_EQ(0, !user_logger_available && !kernel_logger_available);
EXPECT_EQ(0, user_logger_content && kernel_logger_content);
EXPECT_EQ(0, !user_logger_content && !kernel_logger_content);
}