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

* commit '755df2956fdf43e2a8e416a84361f14c474e6a8f':
  logd: test: disable kernel LOGGER
This commit is contained in:
Mark Salyzyn 2014-07-11 02:12:27 +00:00 committed by Android Git Automerger
commit ad806908bb

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);
}