Fix logcat tests. am: 02fa41491a
Original change: https://android-review.googlesource.com/c/platform/system/logging/+/3471812
Change-Id: Ia6c5ee04d1586920ae5437b8d56c386e88258a78
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index dc1df96..9599dd8 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -1220,14 +1220,14 @@
break;
}
- int size, consumed, readable, max, payload;
+ int size, consumed, readable, max_entry, payload;
char size_mult[4], consumed_mult[4], readable_mult[4];
- size = consumed = max = payload = 0;
+ size = consumed = max_entry = payload = 0;
if (8 == sscanf(buffer,
"events: ring buffer is %d %3s (%d %3s consumed, %d %3s readable),"
" max entry is %d B, max payload is %d B",
- &size, size_mult, &consumed, consumed_mult, &readable, readable_mult, &max,
- &payload)) {
+ &size, size_mult, &consumed, consumed_mult, &readable, readable_mult,
+ &max_entry, &payload)) {
long full_size = size, full_consumed = consumed;
switch (size_mult[0]) {
@@ -1257,9 +1257,8 @@
break;
}
EXPECT_GT(full_size, full_consumed);
- EXPECT_GT(full_size, max);
- EXPECT_GT(max, payload);
- EXPECT_GT(max, full_consumed);
+ EXPECT_GT(full_size, max_entry);
+ EXPECT_GT(max_entry, payload);
++minus_g;
continue;
@@ -1684,7 +1683,7 @@
ASSERT_TRUE(android::base::ReadFdToString(fileno(fp), &output));
pclose(fp);
- EXPECT_NE(std::string::npos, output.find("Unknown buffer 'foo'"));
+ EXPECT_NE(std::string::npos, output.find("Unknown -b buffer 'foo'")) << "Output:\n" << output;
}
static void SniffUid(const std::string& line, uid_t& uid) {
