Merge "Add CDM CTS test modules to Test-Mapping Presubmit"

2022-02-03 09:52:38 +00:00
parent 056b4f3a42 6fbb4bc864
commit 214667438f
2 changed files with 8 additions and 7 deletions
--- a/core/java/android/companion/TEST_MAPPING
+++ b/core/java/android/companion/TEST_MAPPING
@@ -1,12 +1,7 @@
 {
-  "presubmit": [
+  "imports": [
    {
-      "name": "CtsOsTestCases",
-      "options": [
-        {
-          "include-filter": "android.os.cts.CompanionDeviceManagerTest"
-        }
-      ]
+      "path": "frameworks/base/services/companion"
    }
  ]
 }
--- a/services/companion/TEST_MAPPING
+++ b/services/companion/TEST_MAPPING
@@ -1,5 +1,11 @@
 {
  "presubmit": [
+    {
+      "name": "CtsCompanionDeviceManagerCoreTestCases"
+    },
+    {
+      "name": "CtsCompanionDeviceManagerUiAutomationTestCases"
+    },
    {
      "name": "CtsOsTestCases",
      "options": [