diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-07-17 17:30:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 17:30:01 +0000 |
| commit | e781da96b51abdce32e8795dd2aca1de223b625e (patch) | |
| tree | 00a3d40cff212d18c693e5dae05fa23afc0e174e /logd/SerializedLogChunkTest.cpp | |
| parent | ce95e551045e0b391fa0aff35814c7ee8f2009ea (diff) | |
| parent | e7e77f71c4de51d600f467be59e1d762a682149a (diff) | |
Merge "logd: always compress SerializedLogChunk in FinishWriting()" am: aa0358b8fe am: e7e77f71c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1365225
Change-Id: I8e86c68e53270f411016e0a8489e0417334c09b7
Diffstat (limited to 'logd/SerializedLogChunkTest.cpp')
| -rw-r--r-- | logd/SerializedLogChunkTest.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/logd/SerializedLogChunkTest.cpp b/logd/SerializedLogChunkTest.cpp index 2b478a3fb..f10b9c673 100644 --- a/logd/SerializedLogChunkTest.cpp +++ b/logd/SerializedLogChunkTest.cpp @@ -113,8 +113,7 @@ TEST(SerializedLogChunk, three_logs) { TEST(SerializedLogChunk, catch_DecCompressedRef_CHECK) { size_t chunk_size = 10 * 4096; auto chunk = SerializedLogChunk{chunk_size}; - EXPECT_DEATH({ chunk.DecReaderRefCount(true); }, ""); - EXPECT_DEATH({ chunk.DecReaderRefCount(false); }, ""); + EXPECT_DEATH({ chunk.DecReaderRefCount(); }, ""); } // Check that the CHECK() in ClearUidLogs() if the ref count is greater than 0 is caught. @@ -123,7 +122,7 @@ TEST(SerializedLogChunk, catch_ClearUidLogs_CHECK) { auto chunk = SerializedLogChunk{chunk_size}; chunk.IncReaderRefCount(); EXPECT_DEATH({ chunk.ClearUidLogs(1000, LOG_ID_MAIN, nullptr); }, ""); - chunk.DecReaderRefCount(false); + chunk.DecReaderRefCount(); } class UidClearTest : public testing::TestWithParam<bool> { @@ -144,7 +143,7 @@ class UidClearTest : public testing::TestWithParam<bool> { check(chunk_); if (finish_writing) { - chunk_.DecReaderRefCount(false); + chunk_.DecReaderRefCount(); } } |