summaryrefslogtreecommitdiff
path: root/TEST_MAPPING
diff options
context:
space:
mode:
authoreasoncylee <easoncylee@google.com>2019-12-09 18:07:55 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-09 18:07:55 -0800
commit8da67c75714dbefb8a99313c1634d1810ccc690f (patch)
tree0d41a06ed33c3e199a401ee241096e1745238b2f /TEST_MAPPING
parent0236cfd992e4e79f3da2fa66ce3d72d181018442 (diff)
parentf5c7e1b90a6ef328af0d30351ca2ab6b4a26406d (diff)
Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite." am: 888c3b0347
am: f5c7e1b90a Change-Id: I2e584c87d94b130ff6f68da2392fe752a9c36694
Diffstat (limited to 'TEST_MAPPING')
-rw-r--r--TEST_MAPPING28
1 files changed, 28 insertions, 0 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ecd307840573..1a6f104892c6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -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"
+ }
+ ]
}
]
}