ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Allow stats buffer to be empty in liblog CTS."

Browse source 
am: 41a9b3c81d

Change-Id: I05e9dc0ae0ad1eea67f0739403aa8160f472f848
This commit is contained in:
Yao Chen 2017-10-25 23:15:24 +00:00 • committed by android-build-merger
commit 5b5ffbda22
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
liblog/tests/log_read_test.cpp
View file

@ -100,9 +100,13 @@ TEST(liblog, android_logger_get_) {
EXPECT_LT(0, get_log_size); EXPECT_LT(0, get_log_size);
// crash buffer is allowed to be empty, that is actually healthy! // crash buffer is allowed to be empty, that is actually healthy!
// kernel buffer is allowed to be empty on "user" builds // kernel buffer is allowed to be empty on "user" builds
// stats buffer is allowed to be empty TEMPORARILY.
// TODO: remove stats buffer from here once we start to use it in
// framework (b/68266385).
EXPECT_LE( // boolean 1 or 0 depending on expected content or empty EXPECT_LE( // boolean 1 or 0 depending on expected content or empty
!!((strcmp("crash", name) != 0) && !!((strcmp("crash", name) != 0) &&
((strcmp("kernel", name) != 0) || __android_log_is_debuggable())), ((strcmp("kernel", name) != 0) || __android_log_is_debuggable()) &&
(strcmp("stats", name) != 0)),
android_logger_get_log_readable_size(logger)); android_logger_get_log_readable_size(logger));
} else { } else {
EXPECT_NE(0, get_log_size); EXPECT_NE(0, get_log_size);