Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite."

am: 888c3b0347 Change-Id: I7e34770fbce6713e560cb5c7bae6292c58c908e1
2019-12-09 18:04:10 -08:00
parent 3844bc141f 888c3b0347
commit f5c7e1b90a
1 changed files with 28 additions and 0 deletions
--- a/28
+++ b/28
@@ -23,6 +23,34 @@
          "exclude-annotation": "androidx.test.filters.FlakyTest"
        }
      ]
+    },
+    {
+      "name": "FrameworksCoreTests",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    },
+    {
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
    }
  ]
 }