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

Commit a1172400 authored by Andre Draszik's avatar Andre Draszik Committed by Android (Google) Code Review
Browse files

Merge changes I14b8bdee,Id4f73972,Ie07fee7d 

* changes:
  VtsHalSensorsV2_1TargetTest: change test file push location
  VtsAidlHalSensorsTargetTest: change test file push location
  TEST_MAPPING: enable vts hal sensors tests in kernel-presubmit
parents 1bd32d30 65e4f77e

sensors/2.1/vts/functional/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


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

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

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

        <option name="push" value="VtsHalSensorsV2_1TargetTest->/data/local/tests/unrestricted/VtsHalSensorsV2_1TargetTest" />

    </target_preparer>



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

        <option name="native-test-timeout" value="900000" />

        <option name="runtime-hint" value="300000"/>

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

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

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

    </test>

</configuration>

sensors/2.1/vts/functional/TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "VtsHalSensorsV2_1TargetTest"

    }

  ],

  "kernel-presubmit": [

    {

      "name": "VtsHalSensorsV2_1TargetTest"

    }

  ]

}

sensors/aidl/TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "VtsAidlHalSensorsTargetTest"

    }

  ],

  "kernel-presubmit": [

    {

      "name": "VtsAidlHalSensorsTargetTest"

    }

  ]

}

sensors/aidl/vts/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


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

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

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

        <option name="push" value="VtsAidlHalSensorsTargetTest->/data/local/tests/unrestricted/VtsAidlHalSensorsTargetTest" />

    </target_preparer>



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

        <option name="native-test-timeout" value="900000" />

        <option name="runtime-hint" value="300000"/>

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

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

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

    </test>

</configuration>