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

Commit c724fb67 authored by Chen Zhu's avatar Chen Zhu
Browse files

Add test config to libstatspull_test and libstatssocket_test 

and apply mainline module test controller to it so that

the tests will only be run when statsd apex is found on device.

Bug: 154845935
Test: m mts && mts-tradefed run mts-statsd
Change-Id: I8939e68b4d4c3772e248c1960b74c0f1bd6a21a6
parent 5daea5a6

libstats/pull/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -85,13 +85,18 @@ cc_test { 
        "libstatssocket",

    ],

    test_suites: ["general-tests", "mts"],

    test_config: "libstatspull_test.xml",



    //TODO(b/153588990): Remove when the build system properly separates 

    //32bit and 64bit architectures.

    compile_multilib: "both",

    multilib: {

        lib64: {

            suffix: "64",

        }

        },

        lib32: {

            suffix: "32",

        },

    },

    cflags: [

        "-Wall",

libstats/pull/libstatspull_test.xml

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

<!-- Copyright (C) 2020 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 libstatspull_test.">

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

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

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



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



    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

       <option name="append-bitness" value="true" />

    </target_preparer>



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

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

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

    </test>



    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.os.statsd" />

    </object>

</configuration>

libstats/socket/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -127,13 +127,17 @@ cc_test { 
        "libutils",

    ],

    test_suites: ["device-tests", "mts"],

    test_config: "libstatssocket_test.xml",

    //TODO(b/153588990): Remove when the build system properly separates 

    //32bit and 64bit architectures.

    compile_multilib: "both",

    multilib: {

        lib64: {

            suffix: "64",

        }

        },

        lib32: {

            suffix: "32",

        },

    },

    require_root: true,

}

libstats/socket/libstatssocket_test.xml

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

<!-- Copyright (C) 2020 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 libstatssocket_test.">

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

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

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



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



    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

       <option name="append-bitness" value="true" />

    </target_preparer>



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

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

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

    </test>



    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.os.statsd" />

    </object>

</configuration>