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

Commit 3079748d authored by Chen Zhu's avatar Chen Zhu Committed by Android (Google) Code Review
Browse files

Merge "Add test config to statsd_test and apply mainline module" into rvc-dev

parents 45654cc7 253d4f3f

cmds/statsd/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ cc_test { 
    name: "statsd_test",

    defaults: ["statsd_defaults"],

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

    test_config: "statsd_test.xml",



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

    //32bit and 64bit architectures.
@@ -299,7 +300,10 @@ cc_test { 
    multilib: {

        lib64: {

            suffix: "64",

        }

        },

        lib32: {

            suffix: "32",

        },

    },



    cflags: [

cmds/statsd/statsd_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 statsd_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="statsd_test->/data/local/tmp/statsd_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="statsd_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>