diff options
| author | 2022-05-26 16:33:14 +0000 | |
|---|---|---|
| committer | 2022-05-26 16:33:14 +0000 | |
| commit | 2ecab118eeb83ef7ad9f4f7dfa6350aaed57789d (patch) | |
| tree | 826a1ad47db86eaadbdba9bb9b708d2bf59eb526 /TEST_MAPPING | |
| parent | 2acd100777ddaf062644f2c2c00a73f49e3e72d3 (diff) | |
| parent | 74dc28153c696a5b8a70b97ced4e25d003120bc1 (diff) | |
Merge "Enable mainline presubmit" into tm-mainline-prod am: 74dc28153c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/18163664
Change-Id: I2105200e0255f43774bdd4e4949aa374f6f0c8bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'TEST_MAPPING')
| -rw-r--r-- | TEST_MAPPING | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 22b3bc691..08df77c08 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" |