commit 2185d52b18dea59b4237d52713505188032fd42d
author Mark Salyzyn <salyzyn@google.com> Thu Apr 05 19:36:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 05 19:36:01 2018 -0700
tree b25b7e6fe1086892ee89a1ec21e4ccaf3bb45e7b
parent 78c63bd0c72458a678ec8321c2ca56ca7daada8c
parent a2a625815b6eba0db807f304b1a8eeb4ea910687

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

Change-Id: I230b476f66a86195bfe5cfb3e153960f205cd496

lmkd/tests/lmkd_test.cpp

diff --git a/lmkd/tests/lmkd_test.cpp b/lmkd/tests/lmkd_test.cpp
index f17512d..8c7a75f 100644
--- a/lmkd/tests/lmkd_test.cpp
+++ b/lmkd/tests/lmkd_test.cpp
@@ -210,6 +210,13 @@
     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);
 
@@ -282,12 +289,6 @@
         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) {