diff options
| author | 2023-01-16 14:23:29 +0000 | |
|---|---|---|
| committer | 2023-01-16 14:23:29 +0000 | |
| commit | ed94e3575c7ede0ce33be0dce6bd010da61cdb68 (patch) | |
| tree | 5f2d5892524a69c83d68a27118d087d4a5eea2ce | |
| parent | d2267f07398fb05416829011b80c0759cc95328d (diff) | |
| parent | f64e96ef62b920fdfd4d26f7b0d3ac7d5b66edff (diff) | |
Merge "Update presubmit mapping for MediaProjection & related"
| -rw-r--r-- | media/java/android/media/projection/TEST_MAPPING | 18 | ||||
| -rw-r--r-- | media/tests/projection/TEST_MAPPING | 13 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/projection/TEST_MAPPING | 18 |
3 files changed, 36 insertions, 13 deletions
diff --git a/media/java/android/media/projection/TEST_MAPPING b/media/java/android/media/projection/TEST_MAPPING new file mode 100644 index 000000000000..a792498b8521 --- /dev/null +++ b/media/java/android/media/projection/TEST_MAPPING @@ -0,0 +1,18 @@ +{ + "presubmit": [ + { + "name": "MediaProjectionTests", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ] +} diff --git a/media/tests/projection/TEST_MAPPING b/media/tests/projection/TEST_MAPPING deleted file mode 100644 index ddb68af10734..000000000000 --- a/media/tests/projection/TEST_MAPPING +++ /dev/null @@ -1,13 +0,0 @@ -{ - "presubmit": [ - { - "name": "FrameworksServicesTests", - "options": [ - {"include-filter": "android.media.projection.mediaprojectiontests"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - } - ] -} diff --git a/services/core/java/com/android/server/media/projection/TEST_MAPPING b/services/core/java/com/android/server/media/projection/TEST_MAPPING new file mode 100644 index 000000000000..a792498b8521 --- /dev/null +++ b/services/core/java/com/android/server/media/projection/TEST_MAPPING @@ -0,0 +1,18 @@ +{ + "presubmit": [ + { + "name": "MediaProjectionTests", + "options": [ + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ] +} |