summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-25 01:20:27 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-25 01:20:27 +0200
commitbe7f315c9d1c3739a35743052ed1528908f6d9e4 (patch)
treeb385aba4a756d9f039121061d2eb2a0550c79e44
parentMerge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 (diff)
parentMerge "Fix flaky tests by require root for minadbd_tests" am: f820e62701 am: d66516ea7c (diff)
downloadandroid_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar.gz
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar.bz2
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar.lz
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar.xz
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.tar.zst
android_bootable_recovery-be7f315c9d1c3739a35743052ed1528908f6d9e4.zip
-rw-r--r--minadbd/Android.bp1
-rw-r--r--minadbd/AndroidTest.xml3
2 files changed, 3 insertions, 1 deletions
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 4cdcac6d9..b6ca59efa 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -135,4 +135,5 @@ cc_test {
test_suites: [
"device-tests",
],
+ require_root: true,
}
diff --git a/minadbd/AndroidTest.xml b/minadbd/AndroidTest.xml
index 7ea235b7c..dbcbac250 100644
--- a/minadbd/AndroidTest.xml
+++ b/minadbd/AndroidTest.xml
@@ -18,9 +18,10 @@
<option name="cleanup" value="true" />
<option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<option name="test-suite-tag" value="apct" />
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="minadbd_test" />
</test>
-</configuration> \ No newline at end of file
+</configuration>