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

Commit 56d814ab authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Radio tests: root before multi-sim preparation. am: 0b4b2718 

Change-Id: I91ee2a286312af140694e1e2aab3b06882988ac4
parents c8c91702 0b4b2718

radio/1.0/vts/functional/vts_hal_radio_target_test.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <!-- TODO: b/154638140, b/152655658: bad interactions -->

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

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

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

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

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

    </target_preparer>





    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

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

radio/1.0/vts/functional/vts_hal_sap_target_test.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <!-- TODO: b/154638140, b/152655658: bad interactions -->

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

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

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

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

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

    </target_preparer>





    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

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

radio/1.1/vts/functional/AndroidTest.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <!-- TODO: b/154638140, b/152655658: bad interactions -->

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

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

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

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

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

    </target_preparer>





    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

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

radio/1.2/vts/functional/AndroidTest.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <!-- TODO: b/154638140, b/152655658: bad interactions -->

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

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

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

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

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

    </target_preparer>





    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

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

radio/1.3/vts/functional/AndroidTest.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
    <option name="test-suite-tag" value="apct" />

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

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

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





    <!-- TODO: b/154638140, b/152655658: bad interactions -->

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

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

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

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

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

    </target_preparer>





    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

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