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

Commit a4f57f04 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Installd: Add explicit test configurations" am: 375da13a am: b9814060 

am: 5fc62f94

Change-Id: I833460925aa83014ec788bbfd43f06393955f0f2
parents 0b21c44a 5fc62f94

cmds/installd/tests/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ cc_test { 
        "libinstalld",

        "liblog",

    ],

    test_config: "installd_utils_test.xml",

}



cc_test {
@@ -39,6 +40,7 @@ cc_test { 
        "liblog",

        "liblogwrap",

    ],

    test_config: "installd_cache_test.xml",

}



cc_test {
@@ -63,6 +65,7 @@ cc_test { 
        "liblog",

        "liblogwrap",

    ],

    test_config: "installd_service_test.xml",

}



cc_test {
@@ -87,6 +90,7 @@ cc_test { 
        "liblog",

        "liblogwrap",

    ],

    test_config: "installd_dexopt_test.xml",

}



cc_test {

cmds/installd/tests/installd_cache_test.xml

0 → 100644
+34 −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.

-->

<!-- Note: this is derived from the autogenerated configuration. We require

           root support. -->

<configuration description="Runs installd_cache_test.">

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

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



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

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

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

    </target_preparer>



    <!-- The test requires root for file access. -->

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



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

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

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

    </test>

</configuration>

cmds/installd/tests/installd_dexopt_test.xml

0 → 100644
+35 −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.

-->

<!-- Note: this is derived from the autogenerated configuration. We require

           root support. -->

<configuration description="Runs installd_dexopt_test.">

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

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



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

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

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

    </target_preparer>



    <!-- The test runs as root to prepare the temporary directory, make selinux adjustments

         and so on. -->

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



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

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

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

    </test>

</configuration>

cmds/installd/tests/installd_service_test.xml

0 → 100644
+34 −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.

-->

<!-- Note: this is derived from the autogenerated configuration. We require

           root support. -->

<configuration description="Runs installd_service_test.">

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

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



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

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

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

    </target_preparer>



    <!-- The test requires root for file access. -->

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



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

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

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

    </test>

</configuration>

cmds/installd/tests/installd_utils_test.xml

0 → 100644
+34 −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.

-->

<!-- Note: this is derived from the autogenerated configuration. We require

           root support. -->

<configuration description="Runs installd_utils_test.">

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

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



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

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

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

    </target_preparer>



    <!-- The test requires root for file access (rollback paths). -->

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



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

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

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

    </test>

</configuration>