Merge "Fix flaky tests by require root for minadbd_tests" am: f820e62701 am: d66516ea7c am: bc606682d2 am: be7f315c9d am: 7082d05439

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1409248

Change-Id: I3e2225259a6ed94fe2ef79a4182c684b54a4cbca
This commit is contained in:
Treehugger Robot 2020-08-25 00:50:46 +00:00 committed by Automerger Merge Worker
commit 9ae74b2435
2 changed files with 3 additions and 1 deletions

View file

@ -135,4 +135,5 @@ cc_test {
test_suites: [ test_suites: [
"device-tests", "device-tests",
], ],
require_root: true,
} }

View file

@ -18,9 +18,10 @@
<option name="cleanup" value="true" /> <option name="cleanup" value="true" />
<option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" /> <option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" />
</target_preparer> </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />
<test class="com.android.tradefed.testtype.GTest" > <test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" /> <option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="minadbd_test" /> <option name="module-name" value="minadbd_test" />
</test> </test>
</configuration> </configuration>