commit 9018f4c048f5ea00785b3347075323a92830a032
author Bernie Innocenti <codewiz@google.com> Wed Jun 19 03:46:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 19 03:46:42 2019 -0700
tree 914a7106a4477f983da730804301c16ec2672626
parent 911799c0222d630d907d385a896653735c3a8b4e
parent 2ec002cfc36a9abb0200938f0c05fe71fe02a809

Merge "Make resolv_stress_test run as root" am: 268a55184f am: 5419167d2a
am: 7a7bb572e0

Change-Id: Id0585b574e27afdcafd119b19771bfa5a3dd0207

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 15ada7f..260145a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,6 +1,8 @@
 cc_test {
     name: "resolv_stress_test",
     test_suites: ["device-tests"],
+    // This won't work with test_config
+    // require_root: true,
     test_config: "resolv_stress_test_config.xml",
     defaults: ["netd_defaults"],
     srcs: [

tests/resolv_stress_test_config.xml

diff --git a/tests/resolv_stress_test_config.xml b/tests/resolv_stress_test_config.xml
index b29dfb5..09ebdbc 100644
--- a/tests/resolv_stress_test_config.xml
+++ b/tests/resolv_stress_test_config.xml
@@ -20,6 +20,7 @@
         <option name="cleanup" value="true" />
         <option name="push" value="resolv_stress_test->/data/local/tmp/resolv_stress_test" />
     </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
 
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />