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

Commit b9b87ab1 authored by Seth Moore's avatar Seth Moore
Browse files

Add VtsRemotelyProvisionedComponentTests config 

VtsHalRemotelyProvisionedComponentTargetTest was picking up the same
config file (AndroidTest.xml) as VtsAidlKeyMintTargetTest. When atest or
TF was used to run VtsHalRemotelyProvisionedComponentTargetTest, it
actually ran VtsAidlKeyMintTargetTest.

Add a separate test config file so that we run the correct test binary.

Test: atest VtsAidlKeyMintTargetTest
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Bug: 192824779
Change-Id: I7ba0f8d364690209722f9a06c6c0ce2957781beb
Merged-In: I7ba0f8d364690209722f9a06c6c0ce2957781beb
parent 572e6cb3

security/keymint/aidl/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ cc_test { 
        "libkeymint_vts_test_utils",

        "libpuresoftkeymasterdevice",

    ],

    test_config: "VtsRemotelyProvisionedComponentTests.xml",

    test_suites: [

        "general-tests",

        "vts",

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.xml

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

<!-- Copyright (C) 2021 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 VtsHalRemotelyProvisionedComponentTargetTest.">

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

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



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



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

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

        <option name="push-file"

            key="VtsHalRemotelyProvisionedComponentTargetTest"

            value="/data/local/tmp/VtsHalRemotelyProvisionedComponentTargetTest" />

    </target_preparer>



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

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

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

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

    </test>

</configuration>