lmkd/tests: handle reordering of killing and reaping reports in the logs am: ec169b178a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2776707 Change-Id: Ic80b2c411f7ddbf108c59a96c38b4d7fd15d34ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
0c737485a5
|
|
@ -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";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue