From 340afd38cba548fc25392bf43bb179faefac89bc Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Tue, 6 Oct 2020 15:54:26 -0700 Subject: logd: fix bad test assumptions SerializedLogChunk.three_logs assumes that log buffers are zero-initialized, but they are not. This causes test failures on host. Test: this test passes Change-Id: I0dfa282bdc36eaa4e8e39d85c5227f717b45ec2a --- logd/SerializedLogChunkTest.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'logd/SerializedLogChunkTest.cpp') diff --git a/logd/SerializedLogChunkTest.cpp b/logd/SerializedLogChunkTest.cpp index 3b451252d..862c3fe31 100644 --- a/logd/SerializedLogChunkTest.cpp +++ b/logd/SerializedLogChunkTest.cpp @@ -99,13 +99,9 @@ TEST(SerializedLogChunk, three_logs) { "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" // Timestamp "\x0C\x00last message"; // msg_len + message - for (size_t i = 0; i < chunk_size; ++i) { - if (i < sizeof(expected_buffer_data)) { - EXPECT_EQ(static_cast(expected_buffer_data[i]), chunk.data()[i]) - << "position: " << i; - } else { - EXPECT_EQ(0, chunk.data()[i]) << "position: " << i; - } + for (size_t i = 0; i < sizeof(expected_buffer_data); ++i) { + EXPECT_EQ(static_cast(expected_buffer_data[i]), chunk.data()[i]) + << "position: " << i; } } -- cgit v1.2.3