From 558f2a166b229499a2c804a3b8bd388189835d47 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 23 May 2017 13:59:42 -0700 Subject: [PATCH] liblog: test: android_logger_get_ "kernel" log buffer can be empty (cherry picked from commit 37eaefa9a0792ece4db77bbc0cf03cc0b6793c54) If user build and for the "kernel" log buffer, allow an empty report. Test: CTS: User: liblog#android_logger_get_ Test: remove ro.debuggable line from /default.prop, run liblog-unit-tests --gtest_filter=*.android_logger_get_ Bug: 62030309 Change-Id: I5f91af07608988f322b3c46574becc308e1d8b13 --- liblog/tests/log_read_test.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/liblog/tests/log_read_test.cpp b/liblog/tests/log_read_test.cpp index a63ab8e88..6ed568aa4 100644 --- a/liblog/tests/log_read_test.cpp +++ b/liblog/tests/log_read_test.cpp @@ -23,6 +23,7 @@ #include #include // minimal logging API #include +#include // Test the APIs in this standalone include file #include // Do not use anything in log/log_time.h despite side effects of the above. @@ -97,9 +98,12 @@ TEST(liblog, android_logger_get_) { /* security buffer is allowed to be denied */ if (strcmp("security", name)) { EXPECT_LT(0, get_log_size); - /* crash buffer is allowed to be empty, that is actually healthy! */ - EXPECT_LE((strcmp("crash", name)) != 0, - android_logger_get_log_readable_size(logger)); + // crash buffer is allowed to be empty, that is actually healthy! + // kernel buffer is allowed to be empty on "user" builds + EXPECT_LE( // boolean 1 or 0 depending on expected content or empty + !!((strcmp("crash", name) != 0) && + ((strcmp("kernel", name) != 0) || __android_log_is_debuggable())), + android_logger_get_log_readable_size(logger)); } else { EXPECT_NE(0, get_log_size); if (get_log_size < 0) {