summaryrefslogtreecommitdiff
path: root/TEST_MAPPING
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-25 15:43:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-05-25 15:43:30 +0000
commit74dc28153c696a5b8a70b97ced4e25d003120bc1 (patch)
tree5ef906e8053c02d80e5b4c65edf6c9b24d2243bf /TEST_MAPPING
parentc0acb8a8bc5ab770e4607540f75aeeb3974c0c18 (diff)
parent08e96c68016d2bec177f88cd6eac4fdde7898103 (diff)
Merge "Enable mainline presubmit" into tm-mainline-prod
Diffstat (limited to 'TEST_MAPPING')
-rw-r--r--TEST_MAPPING46
1 files changed, 25 insertions, 21 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2fc29df8b..6d5973591 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,25 +1,29 @@
{
- // TODO(b/204107787): Re-enable this once MP from master can be installed on R and S devices
- // "mainline-presubmit": [
- // {
- // "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
- // }
- // {
- // "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
- // },
- // {
- // "name": "CtsScopedStorageCoreHostTest"
- // },
- // {
- // "name": "CtsScopedStorageHostTest"
- // },
- // {
- // "name": "CtsScopedStorageDeviceOnlyTest"
- // },
- // {
- // "name": "CtsMediaProviderTranscodeTests[com.google.android.mediaprovider.apex]"
- // }
- // ],
+ "mainline-presubmit": [
+ {
+ "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
+ },
+ {
+ "name": "CtsScopedStorageCoreHostTest[com.google.android.mediaprovider.apex]"
+ },
+ {
+ "name": "CtsScopedStorageHostTest[com.google.android.mediaprovider.apex]"
+ },
+ {
+ "name": "CtsScopedStorageDeviceOnlyTest[com.google.android.mediaprovider.apex]"
+ },
+ {
+ "name": "CtsMediaProviderTranscodeTests[com.google.android.mediaprovider.apex]"
+ },
+ {
+ "name": "CtsPhotoPickerTest[com.google.android.mediaprovider.apex]",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.LargeTest"
+ }
+ ]
+ }
+ ],
"presubmit": [
{
"name": "MediaProviderTests"