summaryrefslogtreecommitdiffstats
path: root/logd/tests/logd_test.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-07-10 13:31:57 -0700
committerMark Salyzyn <salyzyn@google.com>2014-07-10 13:31:57 -0700
commit89472df4cd799182062656352958edb12341b411 (patch)
treeaed422f30017f2c6888dfef4293ef2fc567782f8 /logd/tests/logd_test.cpp
parent796fccb80d603bb79d2591047f1c3b83755bfa8b (diff)
downloadsystem_core-89472df4cd799182062656352958edb12341b411.zip
system_core-89472df4cd799182062656352958edb12341b411.tar.gz
system_core-89472df4cd799182062656352958edb12341b411.tar.bz2
logd: test: disable kernel LOGGER
Bug: 15384806 Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3
Diffstat (limited to 'logd/tests/logd_test.cpp')
-rw-r--r--logd/tests/logd_test.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index 957fdb5..4bea4be 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);
}