From d7146e0f5490f085e430ebdab431140385c385fe Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Thu, 21 Jan 2021 14:35:49 -0800 Subject: [PATCH] lmkd_test: remove memcg creation on non-AndroidGo devices Memory cgroups are disabled on non-AndroidGo devices. Change the test not to fail due to missing in-kernel memory cgroup support. Bug: 172296409 Signed-off-by: Suren Baghdasaryan Change-Id: I35d724c23c22e97458976c1cad45fe9d993326f9 --- tests/lmkd_test.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/lmkd_test.cpp b/tests/lmkd_test.cpp index b1957bc..07d91bb 100644 --- a/tests/lmkd_test.cpp +++ b/tests/lmkd_test.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -274,8 +275,10 @@ void runMemStressTest() { << data->oomadj; data->allocated = 0; data->finished = false; - ASSERT_FALSE(create_memcg(uid, pid) != 0) - << "Child [pid=" << pid << "] failed to create a cgroup"; + if (property_get_bool("ro.config.low_ram", false)) { + ASSERT_FALSE(create_memcg(uid, pid) != 0) + << "Child [pid=" << pid << "] failed to create a cgroup"; + } signal_state(ssync, STATE_CHILD_READY); wait_for_state(ssync, STATE_PARENT_READY); add_pressure(data);