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

Commit 4350b5e4 authored by David Duarte's avatar David Duarte
Browse files

Move all device-tests to general-tests 

device-tests are built alongside the device and reserved for
tests that depends on device-specific functionality.
No Bluetooth tests fall into that category.

https://source.android.com/docs/core/tests/development/test-mapping#package_build_script_rules

Bug: 308438013
Test: N/A
Change-Id: I398ef7614bf022dd97b361de2e8df55ff5cae569
parent b0094d8e

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",

system/btcore/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ cc_library_headers { 
// libbtcore unit tests for target and host

cc_test {

    name: "net_test_btcore",

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",