commit ad806908bb68a03d34bc0bda3ad83abe321021a1
author Mark Salyzyn <salyzyn@google.com> Fri Jul 11 02:12:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 11 02:12:27 2014 +0000
tree 868a867fbd9253bc5a384eada95c387ae78a464e
parent 85dfe98830c78f1c3d400ca7be4ac594bfcdd275
parent 755df2956fdf43e2a8e416a84361f14c474e6a8f

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

* commit '755df2956fdf43e2a8e416a84361f14c474e6a8f':
  logd: test: disable kernel LOGGER

logd/tests/logd_test.cpp

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