Merge "lmkd: test: access /sys/module/lowmemorykiller/ as u:r:shell:s0" am: b69cb7071d

am: 4f7d8851a5

Change-Id: I1ef7aab68bfb5a11891ef4777f6dc46774120a21
This commit is contained in:
Mark Salyzyn 2018-04-05 19:45:16 -07:00 committed by android-build-merger
commit aa0b84afca

View file

@ -215,6 +215,13 @@ void runMemStressTest() {
pid_t pid;
uid_t uid = getuid();
// check if in-kernel LMK driver is present
if (!access(INKERNEL_MINFREE_PATH, W_OK)) {
GTEST_LOG_(INFO) << "Must not have kernel lowmemorykiller driver,"
<< " terminating test";
return;
}
ASSERT_FALSE((sock = lmkd_connect()) < 0)
<< "Failed to connect to lmkd process, err=" << strerror(errno);
@ -287,12 +294,6 @@ TEST(lmkd, check_for_oom) {
GTEST_LOG_(INFO) << "Must be userdebug build, terminating test";
return;
}
// check if in-kernel LMK driver is present
if (!access(INKERNEL_MINFREE_PATH, W_OK)) {
GTEST_LOG_(INFO) << "Must not have kernel lowmemorykiller driver,"
<< " terminating test";
return;
}
// if respawned test process then run the test and exit (no analysis)
if (getenv(LMKDTEST_RESPAWN_FLAG) != NULL) {