From 89472df4cd799182062656352958edb12341b411 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Thu, 10 Jul 2014 13:31:57 -0700 Subject: [PATCH] logd: test: disable kernel LOGGER Bug: 15384806 Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3 --- logd/tests/logd_test.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp index 957fdb5bf..4bea4bee6 100644 --- a/logd/tests/logd_test.cpp +++ b/logd/tests/logd_test.cpp @@ -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); }