commit 5c4127fecb2e0cfeeab237c6ba977a4851b569cc
author Frederick Mayle <fmayle@google.com> Thu Sep 29 15:33:39 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 29 15:33:39 2022 +0000
tree 3fca5dc9ed5b7445f2ea70e6e0e125d8d9f215b2
parent 2255b59d9bfae5f060d047a3f4ce799b6953882f
parent 3e421e7f3419868abaa8d9905b0eaab085f2c304

Merge "Fix crosvm mem usage measurement in MicrodroidBenchmarks"

tests/benchmark/AndroidTest.xml

diff --git a/tests/benchmark/AndroidTest.xml b/tests/benchmark/AndroidTest.xml
index e908077..4949d22 100644
--- a/tests/benchmark/AndroidTest.xml
+++ b/tests/benchmark/AndroidTest.xml
@@ -21,6 +21,10 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="MicrodroidBenchmarkApp.apk" />
     </target_preparer>
+    <!-- Need root to access /proc/$pid/smaps when measuring memory usage. -->
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+        <option name="force-root" value="true" />
+    </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
       <option
         name="run-command"