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

Commit 5960d7b4 authored by Dan Shi's avatar Dan Shi Committed by android-build-merger
Browse files

Merge "Convert VtsHalKeymasterV*_0TargetTest to be parameterized test" 

am: aae9ff23

Change-Id: Id9d1b53f02e6ac768a753f79a87d340396ea989b
parents 4ad2b2ce aae9ff23

keymaster/3.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ cc_test { 
        "libcrypto_static",

        "libsoftkeymasterdevice",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests", "vts-core"],

}

keymaster/3.0/vts/functional/AndroidTest.xml

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

<!-- Copyright (C) 2019 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 VtsHalKeymasterV3_0TargetTest.">

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



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

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

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

    </target_preparer>



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

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

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

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

    </test>

</configuration>

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

+247 −242

File changed.

Preview size limit exceeded, changes collapsed.

keymaster/4.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ cc_test { 
        "libkeymaster4support",

        "libsoftkeymasterdevice",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests", "vts-core"],

}

keymaster/4.0/vts/functional/AndroidTest.xml

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

<!-- Copyright (C) 2019 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 VtsHalKeymasterV4_0TargetTest.">

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



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

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

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

    </target_preparer>



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

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

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

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

    </test>

</configuration>