summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2023-01-11 12:34:22 +0000
committer Naomi Musgrave <nmusgrave@google.com> 2023-01-16 14:02:10 +0000
commitf64e96ef62b920fdfd4d26f7b0d3ac7d5b66edff (patch)
tree9bb943a0c0b4dc0914e33c2c0440ee562f5b4a44
parent2d26e18d523e94e6950aa2e6071e7f615b1c4e8e (diff)
Update presubmit mapping for MediaProjection & related
The desired end state: 1) run unit tests when anything in `android.media.projection` changes 2) TODO - tracked by b/265302522 - run CTS tests when anything in `android.media.projection` changes Tested with "test-mapping" command; runs all presubmit tests in the given directory and parent folders. Bug: 245745197 Test: atest --test-mapping media/java/android/media/projection:presubmit Change-Id: Iaffc209af5ae9433455f184ddbacfb41b6f6094d
-rw-r--r--media/java/android/media/projection/TEST_MAPPING18
-rw-r--r--media/tests/projection/TEST_MAPPING13
-rw-r--r--services/core/java/com/android/server/media/projection/TEST_MAPPING18
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"
+ }
+ ]
+ }
+ ]
+}