Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite." am: 888c3b0347 am: f5c7e1b90a

am: 8da67c7571 Change-Id: I46c9b304a1445f0f6b51e64e7e6b01a6aa3653c8
2019-12-09 18:12:58 -08:00
parent 700c836e03 8da67c7571
commit 4ea8010e25
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"
+        }
+      ]
    }
  ],
  "postsubmit-managedprofile-stress": [