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

Commit 91e03301 authored by Julien Desprez's avatar Julien Desprez
Browse files

Update idmap2_tests to really work host-side 

idmap2_tests is marked host_supported:true but use
a AndroidTest.xml config that can only work for device.

Deleting the explict config to rely on the auto-gen ones.
Adding unit_tests:true to run in presubmit

Test: presubmit, atest idmap2_tests --host
Bug: 179092189
Change-Id: I0b325abc6ce7fc6c777d070bb0fc0e9e8a7cdedd
parent c50447ad

cmds/idmap2/Android.bp

+11 −4
Original line number Diff line number Diff line
@@ -132,9 +132,6 @@ cc_test { 
        "tests/XmlParserTests.cpp",

        "tests/ZipFileTests.cpp",

    ],

    required: [

        "idmap2",

    ],

    static_libs: ["libgmock"],

    target: {

        android: {
@@ -163,9 +160,19 @@ cc_test { 
            shared_libs: [

                "libz",

            ],

            data: [

                ":libz",

                ":idmap2",

            ],

        },

    },

    data: ["tests/data/**/*.apk"],

    data: [

        "tests/data/**/*.apk",

    ],

    compile_multilib: "first",

    test_options: {

        unit_test: true,

    },

}



cc_binary {

cmds/idmap2/AndroidTest.xml

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

<!-- Copyright (C) 2018 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="Config for idmap2_tests">

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

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

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

    </target_preparer>

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

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

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

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

    </test>

</configuration>