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

Commit cac30a28 authored by Jack He's avatar Jack He
Browse files

Add TEST_MAPPING to system/bt 

* Add "postsubmit" test group to TEST_MAPPING in system/bt
* Developer can run tests mannually in system/bt via:
  system/bt$ atest :postsubmit
* Remove legacy configuration files spread across system/bt
* Created unified configuration file system/bt/AndroidTestTemplate.xml
  and add it to the default build config so that developers don't have
  to configure it

Bug: 113359343
Test: atest :postsubmit
Change-Id: I0fdd55b47ef176b5c4ce3d2cd217ffa67cf9bc23
parent 8fb3d37a

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -23,3 +23,10 @@ subdirs = [ 
    "tools",

    "proto",

]



filegroup {

  name: "BluetoothTestConfigTemplate",

  srcs: [

    "AndroidTestTemplate.xml"

  ]

}

system/test/suite/AndroidTest.xml→AndroidTestTemplate.xml

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

<!-- Copyright 2017 The Android Open Source Project

<!-- Copyright 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.
@@ -13,17 +13,21 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Config for net_test_bluetooth">

<configuration description="Runs {MODULE}.">

  <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 class="com.android.tradefed.targetprep.PushFilePreparer">

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

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

    <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

  </target_preparer>

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

        <option name="run-command" value="stop" />

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

    <option name="run-command" value="svc bluetooth disable" />

  </target_preparer>

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

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

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

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

    <option name="module-name" value="{MODULE}" />

    <option name="run-test-as" value="0" />

  </test>

</configuration>

TEST_MAPPING

0 → 100644
+52 −0
Original line number Diff line number Diff line 
{

  "postsubmit" : [

    {

      "name" : "bluetoothtbd_test"

    },

    {

      "name" : "net_test_audio_a2dp_hw"

    },

    {

      "name" : "net_test_avrcp"

    },

    {

      "name" : "net_test_btcore"

    },

    {

      "name" : "net_test_btif"

    },

    {

      "name" : "net_test_btif_profile_queue"

    },

    {

      "name" : "net_test_btpackets"

    },

    {

      "name" : "net_test_device"

    },

    {

      "name" : "net_test_hci"

    },

    {

      "name" : "net_test_performance"

    },

    {

      "name" : "net_test_stack"

    },

    {

      "name" : "net_test_stack_ad_parser"

    },

    {

      "name" : "net_test_stack_multi_adv"

    },

    {

      "name" : "net_test_stack_rfcomm"

    },

    {

      "name" : "net_test_stack_smp"

    },

    {

      "name" : "net_test_types"

    }

  ]

}

system/btcore/AndroidTest.xml

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

<!-- Copyright 2017 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 net_test_btcore">

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

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

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

    </target_preparer>

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

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

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

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

    </test>

</configuration>
 
 No newline at end of file

system/build/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ fluoride_defaults { 


fluoride_defaults {

    name: "fluoride_defaults",

    test_config_template: ":BluetoothTestConfigTemplate",

    defaults: ["fluoride_types_defaults"],

    header_libs: ["libbluetooth_headers"],

    static_libs: [