diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-06-05 07:33:35 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2018-06-05 07:43:15 -0700 |
| commit | 42fb2821ccdb8461239cab4e2203bade07b65ce4 (patch) | |
| tree | c44247f895a82dc2b0656573258198663885af84 /liblog | |
| parent | 2be430aceb28508b5eddce16778ddb9f2900426b (diff) | |
| download | system_core-42fb2821ccdb8461239cab4e2203bade07b65ce4.tar.gz system_core-42fb2821ccdb8461239cab4e2203bade07b65ce4.tar.bz2 system_core-42fb2821ccdb8461239cab4e2203bade07b65ce4.zip | |
liblog: expect content only if ro.logd.kernel is enabled
On svelte devices, CTS test liblog#android_logger_get_ fails on the
missing kernel buffer because it is not enabled to save space.
Test: gTest liblog_unit_tests
Bug: 109669791
Change-Id: Iaf46fe9713d3462a56885515a67db640544345ab
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/tests/log_read_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/liblog/tests/log_read_test.cpp b/liblog/tests/log_read_test.cpp index 444a5ac64..443c3ea58 100644 --- a/liblog/tests/log_read_test.cpp +++ b/liblog/tests/log_read_test.cpp @@ -27,6 +27,7 @@ // Test the APIs in this standalone include file #include <log/log_read.h> // Do not use anything in log/log_time.h despite side effects of the above. +#include <private/android_logger.h> TEST(liblog, __android_log_write__android_logger_list_read) { #ifdef __ANDROID__ @@ -105,7 +106,10 @@ TEST(liblog, android_logger_get_) { // framework (b/68266385). EXPECT_LE( // boolean 1 or 0 depending on expected content or empty !!((strcmp("crash", name) != 0) && - ((strcmp("kernel", name) != 0) || __android_log_is_debuggable()) && + ((strcmp("kernel", name) != 0) || + __android_logger_property_get_bool( + "ro.logd.kernel", BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_ENG | + BOOL_DEFAULT_FLAG_SVELTE)) && (strcmp("stats", name) != 0)), android_logger_get_log_readable_size(logger)); } else { |