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

Commit 3cf484e7 authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge "Blueberry: pts-bot integration to Tradefed" am: 1001ec92 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2005631



Change-Id: Ie602125240bf1ee25abe6ecab715fd63b3069821
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a91074f2 1001ec92

android/blueberry/server/Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_test {

android_test_helper_app {

    name: "BlueberryServer",

    srcs: ["src/**/*.kt"],

    platform_apis: true,
@@ -29,6 +29,13 @@ android_test { 
    },

}



android_test {

    name: "pts-bot",

    required: ["BlueberryServer"],

    test_config: "configs/PtsBotTest.xml",

    data: ["configs/pts_bot_tests_config.json"],

}



java_library {

    name: "blueberry-grpc-java",

    visibility: ["//visibility:private"],

android/blueberry/server/configs/PtsBotTest.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<configuration description="Runs PTS-bot tests">



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

        <option name="test-file-name" value="BlueberryServer.apk" />

        <option name="install-arg" value="-r" />

        <option name="install-arg" value="-g" />

    </target_preparer>

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

        <option name="post-install-cmd" value="am instrument -e Debug false com.android.blueberry/.Main" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.blueberry.PtsBotTest" >

        <option name="mmi2grpc" value="empty" />

        <option name="tests-config-file" value="pts_bot_tests_config.json" />

        <option name="physical" value="false" />

        <option name="profile" value="A2DP/SRC" />

    </test>



</configuration>

android/blueberry/server/configs/pts_bot_tests_config.json

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

    "ics": {

      "TSPC_A2DP_9_4": true,

      "TSPC_A2DP_9_2": true,

      "TSPC_A2DP_9_1": true,

      "TSPC_A2DP_8_3": true,

      "TSPC_A2DP_13_3": true,

      "TSPC_A2DP_13_2": true,

      "TSPC_A2DP_9_3": true,

      "TSPC_A2DP_13_1": true,

      "TSPC_A2DP_8_2": true,

      "TSPC_A2DP_12_3": true,

      "TSPC_A2DP_12_4": true,

      "TSPC_A2DP_12_2": true,

      "TSPC_A2DP_8_4": true,

      "TSPC_A2DP_1_1": true,

      "TSPC_A2DP_1_2": true,

      "TSPC_A2DP_2a_3": true,

      "TSPC_A2DP_2b_2": true,

      "TSPC_A2DP_2_1": true,

      "TSPC_A2DP_2_10": true,

      "TSPC_A2DP_2_10a": true,

      "TSPC_A2DP_2_13": true,

      "TSPC_A2DP_2_2": true,

      "TSPC_A2DP_2_3": true,

      "TSPC_A2DP_2_4": true,

      "TSPC_A2DP_2_5": true,

      "TSPC_A2DP_2_6": true,

      "TSPC_A2DP_2_7": true,

      "TSPC_A2DP_2_8": true,

      "TSPC_A2DP_2_9": true,

      "TSPC_A2DP_3_1": true,

      "TSPC_A2DP_3_1a": true,

      "TSPC_A2DP_3a_1": true,

      "TSPC_A2DP_3a_10": true,

      "TSPC_A2DP_3a_11": true,

      "TSPC_A2DP_3a_12": true,

      "TSPC_A2DP_3a_2": true,

      "TSPC_A2DP_3a_3": true,

      "TSPC_A2DP_3a_4": true,

      "TSPC_A2DP_3a_5": true,

      "TSPC_A2DP_3a_6": true,

      "TSPC_A2DP_3a_7": true,

      "TSPC_A2DP_3a_8": true,

      "TSPC_A2DP_3a_9": true,

      "TSPC_A2DP_4_1": true,

      "TSPC_A2DP_4_10": true,

      "TSPC_A2DP_4_10a": true,

      "TSPC_A2DP_4_13": true,

      "TSPC_A2DP_4_15": true,

      "TSPC_A2DP_4_2": true,

      "TSPC_A2DP_4_3": false,

      "TSPC_A2DP_4_4": true,

      "TSPC_A2DP_4_5": true,

      "TSPC_A2DP_4_6": true,

      "TSPC_A2DP_4_7": true,

      "TSPC_A2DP_4_8": false,

      "TSPC_A2DP_4_9": true,

      "TSPC_A2DP_7a_3": true,

      "TSPC_A2DP_7b_2": true,

      "TSPC_A2DP_5_1": true,

      "TSPC_A2DP_5_1a": true,

      "TSPC_A2DP_5a_1": true,

      "TSPC_A2DP_5a_10": true,

      "TSPC_A2DP_5a_11": true,

      "TSPC_A2DP_5a_12": true,

      "TSPC_A2DP_5a_2": true,

      "TSPC_A2DP_5a_3": true,

      "TSPC_A2DP_5a_4": true,

      "TSPC_A2DP_5a_5": true,

      "TSPC_A2DP_5a_6": true,

      "TSPC_A2DP_5a_7": true,

      "TSPC_A2DP_5a_8": true,

      "TSPC_A2DP_5a_9": true,

      "TSPC_AVDTP_1_1": true,

      "TSPC_AVDTP_1_2": true,

      "TSPC_AVDTP_1_3": true,

      "TSPC_AVDTP_1_4": true,

      "TSPC_AVDTP_16_1": true,

      "TSPC_AVDTP_16_3": true,

      "TSPC_AVDTP_2_1": true,

      "TSPC_AVDTP_2_2": true,

      "TSPC_AVDTP_2_3": true,

      "TSPC_AVDTP_2_4": true,

      "TSPC_AVDTP_2b_1": true,

      "TSPC_AVDTP_2b_2": true,

      "TSPC_AVDTP_2b_3": true,

      "TSPC_AVDTP_2b_4": true,

      "TSPC_AVDTP_3_1": true,

      "TSPC_AVDTP_3_2": true,

      "TSPC_AVDTP_3b_1": true,

      "TSPC_AVDTP_3b_2": true,

      "TSPC_AVDTP_4_1": true,

      "TSPC_AVDTP_4_2": true,

      "TSPC_AVDTP_4_3": true,

      "TSPC_AVDTP_4_4": true,

      "TSPC_AVDTP_4_5": false,

      "TSPC_AVDTP_4_6": true,

      "TSPC_AVDTP_4b_1": true,

      "TSPC_AVDTP_4b_2": true,

      "TSPC_AVDTP_4b_3": true,

      "TSPC_AVDTP_4b_4": false,

      "TSPC_AVDTP_4b_5": false,

      "TSPC_AVDTP_4b_6": true,

      "TSPC_AVDTP_5_1": true,

      "TSPC_AVDTP_5_2": true,

      "TSPC_AVDTP_5_3": true,

      "TSPC_AVDTP_5_4": true,

      "TSPC_AVDTP_5_5": true,

      "TSPC_AVDTP_5b_1": true,

      "TSPC_AVDTP_5b_2": false,

      "TSPC_AVDTP_5b_3": true,

      "TSPC_AVDTP_5b_4": false,

      "TSPC_AVDTP_5b_5": true,

      "TSPC_AVDTP_6b_1": true,

      "TSPC_AVDTP_7_1": true,

      "TSPC_AVDTP_7b_1": true,

      "TSPC_AVDTP_10_1": true,

      "TSPC_AVDTP_10_2": true,

      "TSPC_AVDTP_10_3": true,

      "TSPC_AVDTP_10_4": true,

      "TSPC_AVDTP_10_5": true,

      "TSPC_AVDTP_10_6": true,

      "TSPC_AVDTP_10b_1": true,

      "TSPC_AVDTP_10b_2": true,

      "TSPC_AVDTP_10b_3": true,

      "TSPC_AVDTP_10b_4": true,

      "TSPC_AVDTP_10b_5": true,

      "TSPC_AVDTP_10b_6": true,

      "TSPC_AVDTP_11_1": true,

      "TSPC_AVDTP_11_2": true,

      "TSPC_AVDTP_11_3": true,

      "TSPC_AVDTP_11_4": true,

      "TSPC_AVDTP_11_5": true,

      "TSPC_AVDTP_11_6": true,

      "TSPC_AVDTP_11b_1": true,

      "TSPC_AVDTP_11b_2": true,

      "TSPC_AVDTP_11b_3": true,

      "TSPC_AVDTP_11b_4": true,

      "TSPC_AVDTP_11b_5": true,

      "TSPC_AVDTP_11b_6": true,

      "TSPC_AVDTP_12b_1": true,

      "TSPC_AVDTP_13_1": true,

      "TSPC_AVDTP_13b_1": true,

      "TSPC_AVDTP_8_1": true,

      "TSPC_AVDTP_8_2": true,

      "TSPC_AVDTP_8_3": true,

      "TSPC_AVDTP_8_4": true,

      "TSPC_AVDTP_8b_1": true,

      "TSPC_AVDTP_8b_2": true,

      "TSPC_AVDTP_8b_3": true,

      "TSPC_AVDTP_8b_4": true,

      "TSPC_AVDTP_9_1": true,

      "TSPC_AVDTP_9_2": true,

      "TSPC_AVDTP_9b_1": true,

      "TSPC_AVDTP_9b_2": true,

      "TSPC_AVDTP_14_1": true,

      "TSPC_AVDTP_14_6": true,

      "TSPC_AVDTP_14a_3": true,

      "TSPC_AVDTP_15_1": true,

      "TSPC_AVDTP_15_6": false,

      "TSPC_AVDTP_15a_3": true,

      "TSPC_SUM ICS_31_22": true,

      "TSPC_PROD_1_2": true,

      "TSPC_PROD_3_1": true

    },

    "ixit": {"default": {}, "A2DP": {}, "AVDTP": {}},

    "skip": [

      "A2DP/SRC/SET/BV-05-I",

      "A2DP/SRC/SET/BV-06-I",

      "A2DP/SNK/SYN/BV-01-C",

      "AVDTP/SRC/INT/SIG/SMG/BV-11-C",

      "AVDTP/SRC/INT/SIG/SMG/BV-23-C",

      "AVDTP/SNK/INT/SIG/SMG/BV-19-C",

      "AVDTP/SNK/INT/SIG/SMG/BV-23-C",

      "A2DP/SRC/CC/BV-09-I"

    ]

  }