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

Commit 40e9f153 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24232539'] into udc-release. 

Change-Id: I9747ab0af6f78d6d9a17efbc4600986b32403067
parents b8ca43b8 9049f9d5

radio/1.2/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-timeout" value="300000" /> <!-- 5 min -->

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

    </test>

</configuration>

radio/1.3/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-timeout" value="300000" /> <!-- 5 min -->

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

    </test>

</configuration>

radio/1.4/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-timeout" value="300000" /> <!-- 5 min -->

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

    </test>

</configuration>

radio/1.5/vts/functional/AndroidTest.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs VtsHalRadioV1_5TargetTest.">

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

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

    <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />



    <!-- 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.RootTargetPreparer" />



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

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

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

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-timeout" value="300000" /> <!-- 5 min -->

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

    </test>

</configuration>

radio/1.6/vts/functional/AndroidTest.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs VtsHalRadioV1_6TargetTest.">

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

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

    <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />



    <!-- 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.RootTargetPreparer" />



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

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

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

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="native-test-timeout" value="300000" /> <!-- 5 min -->

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

    </test>

</configuration>