Add host tests to TEST_MAPPING

Also added some missing test_suites setting.

Following tests don't have host_supported set to true in Android.bp:
net_test_audio_a2dp_hw
net_test_btif
net_test_btif_profile_queue
net_test_device
net_test_hci
net_test_stack
net_test_stack_ad_parser
net_test_stack_smp

Following tests failed to run in host with error "did not report any run":
net_test_performance
net_test_stack_rfcomm

Bug: 111921389
Test: system/bt$ atest --host :postsubmit
Change-Id: I5f55cead7a2ad1cadea48220f45781f4f74949dd

diff --git a/TEST_MAPPING b/TEST_MAPPING
index f56528a..f090f04 100644 (file)
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -52,8 +52,28 @@
       "name" : "net_test_types"
     },
     {
+      "name" : "bluetooth_test_common",
+      "host" : true
+    },
+    {
+      "name" : "bluetoothtbd_test",
+      "host" : true
+    },
+    {
       "name" : "net_test_avrcp",
       "host" : true
+    },
+    {
+      "name" : "net_test_btcore",
+      "host" : true
+    },
+    {
+      "name" : "net_test_btpackets",
+      "host" : true
+    },
+    {
+      "name" : "net_test_types",
+      "host" : true
     }
   ]
 }

diff --git a/btif/Android.bp b/btif/Android.bp
index 9460972..c65bb87 100644 (file)
--- a/btif/Android.bp
+++ b/btif/Android.bp
@@ -118,6 +118,7 @@ cc_library_static {
 cc_test {
     name: "net_test_btif",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     include_dirs: btifCommonIncludes,
     srcs: ["test/btif_storage_test.cc"],
     header_libs: ["libbluetooth_headers"],
@@ -160,6 +161,7 @@ cc_test {
 cc_test {
     name: "net_test_btif_profile_queue",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     include_dirs: btifCommonIncludes,
     srcs: [
       "src/btif_profile_queue.cc",

diff --git a/common/Android.bp b/common/Android.bp
index d48cdc8..a3349cd 100644 (file)
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -58,6 +58,7 @@ cc_test {
 cc_test {
     name: "net_test_performance",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     include_dirs: ["system/bt"],
     host_supported: true,
     srcs: [

diff --git a/packet/Android.bp b/packet/Android.bp
index 200ebab..44d0625 100644 (file)
--- a/packet/Android.bp
+++ b/packet/Android.bp
@@ -15,6 +15,7 @@ cc_library_static {
 cc_test {
     name: "net_test_btpackets",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     host_supported: true,
     local_include_dirs: ["tests"],
     include_dirs: [

diff --git a/stack/Android.bp b/stack/Android.bp
index cf3d9a4..8bb965d 100644 (file)
--- a/stack/Android.bp
+++ b/stack/Android.bp
@@ -190,6 +190,7 @@ cc_library_static {
 cc_test {
     name: "net_test_stack",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     local_include_dirs: [
         "include",
     ],
@@ -227,6 +228,7 @@ cc_test {
 cc_test {
     name: "net_test_stack_rfcomm",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     host_supported: true,
     local_include_dirs: [
         "include",
@@ -283,6 +285,7 @@ cc_test {
 cc_test {
     name: "net_test_stack_smp",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     local_include_dirs: [
         "include",
         "btm",
@@ -322,6 +325,7 @@ cc_test {
 cc_test {
     name: "net_test_stack_multi_adv",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     local_include_dirs: [
         "include",
         "btm",
@@ -356,6 +360,7 @@ cc_test {
 cc_test {
     name: "net_test_stack_ad_parser",
     defaults: ["fluoride_defaults"],
+    test_suites: ["device-tests"],
     local_include_dirs: [
         "include",
     ],