summaryrefslogtreecommitdiff
path: root/TEST_MAPPING
diff options
context:
space:
mode:
author Corina Grigoras <corinac@google.com> 2022-01-20 16:02:13 +0000
committer Corina Grigoras <corinac@google.com> 2022-05-20 14:43:27 +0000
commit08e96c68016d2bec177f88cd6eac4fdde7898103 (patch)
tree366230762f5ca08d492245205a78cdbcf6f1009a /TEST_MAPPING
parentd5780e8d95053f4f94667d221530a88773c202ac (diff)
Enable mainline presubmit
Since module from master can now be installed on released versions Bug: 185553751 Bug: 204107787 Change-Id: I95b05a36660a87a6e47a84dfb6491b87e38f614c Test: Presubmit
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"