commit 1d42e7265b8ea9609fed70b59cdb222200a07352
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 13 16:43:23 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 13 16:43:23 2022 +0000
tree c16f485e8a9590b27970fd4873f064820e330491
parent 03523a8b2c24b7a422f4072e0f37186fdd6e2f6f
parent ba45693795e71dfdddc25f8de36cd01743881612

Merge "Add adbd pairing tests to mainline test mapping for adbd." into tm-dev am: ba45693795

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/adb/+/18282644

Change-Id: I9a1691bf9220f2fae4eb5e6cd573fe3b99b54064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2c5742b..bb00729 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,6 +2,18 @@
   "mainline-presubmit": [
     {
       "name": "adbd_test[com.google.android.adbd.apex]"
+    },
+    {
+      "name": "adb_crypto_test[com.google.android.adbd.apex]"
+    },
+    {
+      "name": "adb_pairing_auth_test[com.google.android.adbd.apex]"
+    },
+    {
+      "name": "adb_pairing_connection_test[com.google.android.adbd.apex]"
+    },
+    {
+      "name": "adb_tls_connection_test[com.google.android.adbd.apex]"
     }
   ],
   "presubmit": [

crypto/tests/Android.bp

diff --git a/crypto/tests/Android.bp b/crypto/tests/Android.bp
index 1ef5f3d..d45b05d 100644
--- a/crypto/tests/Android.bp
+++ b/crypto/tests/Android.bp
@@ -47,5 +47,5 @@
         "libadb_sysdeps",
     ],
 
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests", "mts-adbd"],
 }

pairing_auth/tests/Android.bp

diff --git a/pairing_auth/tests/Android.bp b/pairing_auth/tests/Android.bp
index b6cff91..9105aa5 100644
--- a/pairing_auth/tests/Android.bp
+++ b/pairing_auth/tests/Android.bp
@@ -43,5 +43,5 @@
         "libadb_pairing_auth_static",
     ],
 
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests", "mts-adbd"],
 }

pairing_connection/tests/Android.bp

diff --git a/pairing_connection/tests/Android.bp b/pairing_connection/tests/Android.bp
index 6070ef9..a6eb35f 100644
--- a/pairing_connection/tests/Android.bp
+++ b/pairing_connection/tests/Android.bp
@@ -52,5 +52,5 @@
         "libadb_tls_connection_static",
     ],
 
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests", "mts-adbd"],
 }

tls/tests/Android.bp

diff --git a/tls/tests/Android.bp b/tls/tests/Android.bp
index 2d3bb2b..cbb3a6a 100644
--- a/tls/tests/Android.bp
+++ b/tls/tests/Android.bp
@@ -47,5 +47,5 @@
         "libadb_tls_connection_static",
     ],
 
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests", "mts-adbd"],
 }