Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a72557 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6740297 from a333c274 to sc-release 

Change-Id: I0881b25f90e01193feb88ec9435de579cc836bc8
parents 3361a2ed a333c274

resolv_test_config_template.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
<configuration description="Configuration for {MODULE} tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

       <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

       <option name="append-bitness" value="true" />

   </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" />

       <option name="module-name" value="{MODULE}" />

tests/resolv_gold_test_config.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
<configuration description="Configuration for resolv gold tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />

   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

       <option name="push" value="resolv_gold_test->/data/local/tmp/resolv_gold_test" />

       <!-- Temporary solotuon for b/151392634 -->

       <option name="push" value="testdata->/data/local/tmp/testdata/" />

   </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" />

       <option name="module-name" value="resolv_gold_test" />