From 9c51243d8bbcc5ee65dd6f7adc031e410ba5e86b Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 9 Mar 2015 12:42:56 -0700 Subject: [PATCH] logcat: test: logcat.logrotate fails Test did not handle all possible multiples of block sizes. Bug: 19604106 Change-Id: I693358be9598926389631baf21c5883e0f2fd735 --- logcat/tests/logcat_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp index b3584854d..de2db674d 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp @@ -505,12 +505,14 @@ TEST(logcat, logrotate) { while (fgets(buffer, sizeof(buffer), fp)) { static const char match_1[] = "4 log.txt"; static const char match_2[] = "8 log.txt"; - static const char match_3[] = "16 log.txt"; + static const char match_3[] = "12 log.txt"; + static const char match_4[] = "16 log.txt"; static const char total[] = "total "; if (!strncmp(buffer, match_1, sizeof(match_1) - 1) || !strncmp(buffer, match_2, sizeof(match_2) - 1) - || !strncmp(buffer, match_3, sizeof(match_3) - 1)) { + || !strncmp(buffer, match_3, sizeof(match_3) - 1) + || !strncmp(buffer, match_4, sizeof(match_4) - 1)) { ++count; } else if (strncmp(buffer, total, sizeof(total) - 1)) { fprintf(stderr, "WARNING: Parse error: %s", buffer);