wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd/tests: handle reordering of killing and reaping reports in the logs am: ec169b178a am: 0c737485a5 am: 4616be7cc8 am: a39f4e42b4 am: b35fb6b96d 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2776707

Change-Id: I1d9130364a00f2c20ee9b4f143ed68bec12de981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Suren Baghdasaryan 2023-10-06 01:51:02 +00:00 committed by Automerger Merge Worker
parent 9cfae5f47b b35fb6b96d
commit 00321c0fdf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/lmkd_tests.cpp
View File

@ -211,10 +211,10 @@ TEST_F(LmkdTest, TargetReaping) {
ASSERT_TRUE(ParseProcSize(line, rss, swap)) << "Kill report format is invalid"; ASSERT_TRUE(ParseProcSize(line, rss, swap)) << "Kill report format is invalid";
// find reap duration report // find reap duration report
line_start = logcat_out.find(LMKD_REAP_LINE_START, line_end); line_start = logcat_out.find(LMKD_REAP_LINE_START);
if (line_start == std::string::npos) { if (line_start == std::string::npos) {
// Target might have exited before reaping started // Target might have exited before reaping started
line_start = logcat_out.find(LMKD_REAP_MRELESE_ERR_MARKER, line_end); line_start = logcat_out.find(LMKD_REAP_MRELESE_ERR_MARKER);
ASSERT_TRUE(line_start != std::string::npos) << "Reaping time report is not found"; ASSERT_TRUE(line_start != std::string::npos) << "Reaping time report is not found";