From 4350b5e4aa2f92869d24e57463f451aa8f7e41a0 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Mon, 30 Oct 2023 17:26:30 +0000
Subject: [PATCH] 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
---
android/app/tests/unit/Android.bp | 2 +-
system/audio_a2dp_hw/Android.bp | 2 +-
system/audio_hearing_aid_hw/Android.bp | 2 +-
system/bta/Android.bp | 28 +++++++++----------
system/btcore/Android.bp | 2 +-
system/btif/Android.bp | 16 +++++------
system/common/Android.bp | 4 +--
system/device/Android.bp | 4 +--
system/embdrv/tests/Android.bp | 4 +--
system/gd/Android.bp | 4 +--
system/gd/dumpsys/Android.bp | 2 +-
system/hci/Android.bp | 2 +-
system/main/Android.bp | 2 +-
system/osi/Android.bp | 2 +-
system/packet/Android.bp | 2 +-
system/stack/Android.bp | 38 +++++++++++++-------------
system/test/suite/Android.bp | 2 +-
system/types/Android.bp | 2 +-
18 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/android/app/tests/unit/Android.bp b/android/app/tests/unit/Android.bp
index 9c024660cc4..ab75ba59a57 100644
--- a/android/app/tests/unit/Android.bp
+++ b/android/app/tests/unit/Android.bp
@@ -46,7 +46,7 @@ java_defaults {
test_suites: [
"automotive-tests",
- "device-tests",
+ "general-tests",
"mts-bluetooth",
],
diff --git a/system/audio_a2dp_hw/Android.bp b/system/audio_a2dp_hw/Android.bp
index 1a7439fb243..2d863902e85 100644
--- a/system/audio_a2dp_hw/Android.bp
+++ b/system/audio_a2dp_hw/Android.bp
@@ -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",
diff --git a/system/audio_hearing_aid_hw/Android.bp b/system/audio_hearing_aid_hw/Android.bp
index 66d357ef19b..f4d451160a8 100644
--- a/system/audio_hearing_aid_hw/Android.bp
+++ b/system/audio_hearing_aid_hw/Android.bp
@@ -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",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index aecf303e540..1add3f60f0b 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -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",
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index a946aa57d71..2436c72e3f0 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -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",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 6838508e483..4aac9aa7d4e 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -261,7 +261,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: btifCommonIncludes,
srcs: [
"test/btif_storage_test.cc",
@@ -344,7 +344,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: btifCommonIncludes,
srcs: [
"src/btif_profile_queue.cc",
@@ -377,7 +377,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: btifCommonIncludes + [
"frameworks/av/media/libaaudio/include",
],
@@ -413,7 +413,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -465,7 +465,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -508,7 +508,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: btifCommonIncludes,
srcs: [
":TestCommonMockFunctions",
@@ -543,7 +543,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: [
"frameworks/av/media/libaaudio/include",
"packages/modules/Bluetooth/system",
@@ -682,7 +682,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: [
"frameworks/av/media/libaaudio/include",
"packages/modules/Bluetooth/system",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 2702e11d163..9e58054b2c9 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -62,7 +62,7 @@ cc_library_static {
cc_test {
name: "bluetooth_test_common",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_defaults",
@@ -123,7 +123,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
include_dirs: ["packages/modules/Bluetooth/system"],
host_supported: true,
srcs: [
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 3b7fc75a557..41cfcaf6066 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -39,7 +39,7 @@ cc_library_static {
// Bluetooth device unit tests for target
cc_test {
name: "net_test_device",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_defaults",
@@ -69,7 +69,7 @@ cc_test {
// Bluetooth device unit tests for target
cc_test {
name: "net_test_device_iot_config",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_defaults",
diff --git a/system/embdrv/tests/Android.bp b/system/embdrv/tests/Android.bp
index 7941fa92d95..6e53b1b0f3e 100644
--- a/system/embdrv/tests/Android.bp
+++ b/system/embdrv/tests/Android.bp
@@ -13,7 +13,7 @@ cc_test {
"bluetooth_gtest_x86_asan_workaround",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -33,7 +33,7 @@ cc_test {
"bluetooth_gtest_x86_asan_workaround",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index a5eea526170..43131766de8 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -335,7 +335,7 @@ cc_binary {
cc_test {
name: "bluetooth_test_gd_unit",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"gd_defaults",
@@ -439,7 +439,7 @@ cc_test {
cc_test {
name: "bluetooth_packet_parser_test",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"gd_defaults",
diff --git a/system/gd/dumpsys/Android.bp b/system/gd/dumpsys/Android.bp
index 5195a550196..4efa4083939 100644
--- a/system/gd/dumpsys/Android.bp
+++ b/system/gd/dumpsys/Android.bp
@@ -193,7 +193,7 @@ cc_library {
cc_test {
name: "bluetooth_flatbuffer_tests",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_cflags",
"bluetooth_gtest_x86_asan_workaround",
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index e6a2a79bec2..4b3b1c8baa2 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -42,7 +42,7 @@ cc_library_static {
// HCI unit tests for target
cc_test {
name: "net_test_hci",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_defaults",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index cef01dd6f32..d81aa88b390 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -161,7 +161,7 @@ cc_library_static {
cc_test {
name: "net_test_main_shim",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 904d3097cae..f04fd56b558 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -101,7 +101,7 @@ cc_library_static {
// libosi unit tests for target and host
cc_test {
name: "net_test_osi",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_osi_defaults",
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 309e8c6e6c5..cf2f68d56f3 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -32,7 +32,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index b8e10dac084..ebf078e718f 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -671,7 +671,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
local_include_dirs: [
"include",
],
@@ -753,7 +753,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
local_include_dirs: [
"btm",
@@ -841,7 +841,7 @@ cc_test {
"mts_defaults",
],
host_supported: true,
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
local_include_dirs: [
"btm",
"include",
@@ -913,7 +913,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
local_include_dirs: [
"include",
],
@@ -986,7 +986,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1051,7 +1051,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1122,7 +1122,7 @@ cc_test {
"-DUNIT_TESTS",
"-Wno-unused-parameter",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1234,7 +1234,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1278,7 +1278,7 @@ cc_test {
"fluoride_defaults",
"mts_defaults",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
include_dirs: [
"packages/modules/Bluetooth/system",
@@ -1336,7 +1336,7 @@ cc_test {
// Iso manager unit tests
cc_test {
name: "net_test_btm_iso",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1389,7 +1389,7 @@ cc_test {
// EATT unit tests
cc_test {
name: "net_test_eatt",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1456,7 +1456,7 @@ cc_test {
cc_test {
name: "net_test_stack_btm",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
test_options: {
unit_test: true,
@@ -1583,7 +1583,7 @@ cc_test {
cc_test {
name: "net_test_stack_hci",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -1631,7 +1631,7 @@ cc_test {
cc_test {
name: "net_test_stack_hid",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -1698,7 +1698,7 @@ cc_test {
cc_test {
name: "net_test_stack_btu",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -1769,7 +1769,7 @@ cc_test {
cc_test {
name: "net_test_stack_gatt",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -1863,7 +1863,7 @@ cc_test {
cc_test {
name: "net_test_stack_l2cap",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -1952,7 +1952,7 @@ cc_test {
cc_test {
name: "net_test_stack_acl",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
@@ -2039,7 +2039,7 @@ cc_test {
// Bluetooth stack connection multiplexing
cc_test {
name: "net_test_stack_sdp",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
host_supported: true,
defaults: [
"bluetooth_gtest_x86_asan_workaround",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 74b7d14f179..695cee61e99 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -104,7 +104,7 @@ cc_defaults {
cc_test {
name: "net_test_bluetooth",
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"mts_defaults",
diff --git a/system/types/Android.bp b/system/types/Android.bp
index f12bccd3c82..9acf5b44c2b 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -61,7 +61,7 @@ cc_test {
"libchrome",
"libosi", // strlcpy
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
"fluoride_defaults",
--
GitLab