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

Commit 313e2001 authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge changes I398ef761,Ia6c2912b into main 

* changes:
  Move all device-tests to general-tests
  Remove test with ASAN enabled from hwasan-presubmit
parents 2d56c8e2 4350b5e4

TEST_MAPPING

+0 −93
Original line number Diff line number Diff line
@@ -325,15 +325,9 @@ 
    {

      "name": "net_test_gatt_conn_multiplexing"

    },

    {

      "name": "net_test_hci"

    },

    {

      "name": "net_test_stack"

    },

    {

      "name": "net_test_stack_a2dp_codecs_native"

    },

    {

      "name": "net_test_stack_ad_parser"

    },
@@ -341,127 +335,40 @@ 
    // Thoses test run on the host in the CI automatically.

    // Run the one that are available on the device on the

    // device as well

    {

      "name": "bluetooth_csis_test"

    },

    {

      "name": "bluetooth_flatbuffer_tests"

    },

    {

      "name": "bluetooth_groups_test"

    },

    {

      "name": "bluetooth_has_test"

    },

    {

      "name": "bluetooth_hh_test"

    },

    {

      "name": "bluetooth_le_audio_client_test"

    },

    // b/271319421

    // {

    //   "name": "bluetooth_le_audio_test"

    // },

    {

      "name": "bluetooth_packet_parser_test"

    },

    {

      "name": "bluetooth_test_broadcaster"

    },

    {

      "name": "bluetooth_test_broadcaster_state_machine"

    },

    {

      "name": "bluetooth_test_common"

    },

    {

      "name": "bluetooth_test_gd_unit"

    },

    {

      "name": "bluetooth_test_sdp"

    },

    {

      "name": "bluetooth_vc_test"

    },

    {

      "name": "bt_host_test_bta"

    },

    {

      "name": "libaptx_enc_tests"

    },

    {

      "name": "libaptxhd_enc_tests"

    },

    {

      "name": "net_test_avrcp"

    },

    {

      "name": "net_test_btcore"

    },

    {

      "name": "net_test_btif_config_cache"

    },

    {

      "name": "net_test_btif_hh"

    },

    {

      "name": "net_test_btif_rc"

    },

    {

      "name": "net_test_btif_stack"

    },

    {

      "name": "net_test_btm_iso"

    },

    {

      "name": "net_test_btpackets"

    },

    {

      "name": "net_test_eatt"

    },

    {

      "name": "net_test_main_shim"

    },

    {

      "name": "net_test_osi"

    },

    {

      "name": "net_test_performance"

    },

    {

      "name": "net_test_stack_a2dp_native"

    },

    {

      "name": "net_test_stack_acl"

    },

    {

      "name": "net_test_stack_avdtp"

    },

    {

      "name": "net_test_stack_btm"

    },

    {

      "name": "net_test_stack_btu"

    },

    {

      "name": "net_test_stack_gatt"

    },

    {

      "name": "net_test_stack_gatt_native"

    },

    {

      "name": "net_test_stack_gatt_sr_hash_native"

    },

    {

      "name": "net_test_stack_hci"

    },

    {

      "name": "net_test_stack_hid"

    },

    {

      "name": "net_test_stack_l2cap"

    },

    {

      "name": "net_test_stack_rfcomm"

    },

android/app/tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ java_defaults { 


    test_suites: [

        "automotive-tests",

        "device-tests",

        "general-tests",

        "mts-bluetooth",

    ],

system/audio_a2dp_hw/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ cc_library_static { 
// Audio A2DP library unit tests for target and host

cc_test {

    name: "net_test_audio_a2dp_hw",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "audio_a2dp_hw_defaults",

        "bluetooth_gtest_x86_asan_workaround",

system/audio_hearing_aid_hw/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ cc_library { 
// Audio A2DP library unit tests for target and host

cc_test {

    name: "net_test_audio_hearing_aid_hw",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "audio_hearing_aid_hw_defaults",

        "bluetooth_gtest_x86_asan_workaround",

system/bta/Android.bp

+14 −14
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    srcs: [

        ":LegacyStackSdp",

        ":TestCommonMockFunctions",
@@ -279,7 +279,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    srcs: [

        ":TestCommonMockFunctions",

        ":TestMockBtif",
@@ -322,7 +322,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    host_supported: true,

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -458,7 +458,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    host_supported: true,

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -518,7 +518,7 @@ cc_test { 
// csis unit tests for host

cc_test {

    name: "bluetooth_csis_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -579,7 +579,7 @@ cc_test { 
// groups unit tests for host

cc_test {

    name: "bluetooth_groups_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -627,7 +627,7 @@ cc_test { 
// bta unit tests for host

cc_test {

    name: "bluetooth_vc_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -753,7 +753,7 @@ prebuilt_etc { 
// ========================================================

cc_test {

    name: "bluetooth_le_audio_codec_manager_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",
@@ -829,7 +829,7 @@ cc_test { 


cc_test {

    name: "bluetooth_le_audio_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",
@@ -932,7 +932,7 @@ cc_test { 


cc_test {

    name: "bluetooth_le_audio_client_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults",
@@ -1039,7 +1039,7 @@ cc_test { 


cc_test {

    name: "bluetooth_test_broadcaster_state_machine",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -1097,7 +1097,7 @@ cc_test { 


cc_test {

    name: "bluetooth_test_broadcaster",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -1167,7 +1167,7 @@ cc_test { 


cc_test {

    name: "bluetooth_has_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",
@@ -1229,7 +1229,7 @@ cc_test { 


cc_test {

    name: "bluetooth_hh_test",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",