diff options
| -rw-r--r-- | core/java/android/os/TEST_MAPPING | 13 | ||||
| -rw-r--r-- | services/core/java/com/android/server/vibrator/TEST_MAPPING | 19 | ||||
| -rw-r--r-- | services/core/jni/TEST_MAPPING | 16 | ||||
| -rw-r--r-- | services/tests/vibrator/TEST_MAPPING | 18 |
4 files changed, 49 insertions, 17 deletions
diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING index 954ee3c99346..dae9b5ea6a43 100644 --- a/core/java/android/os/TEST_MAPPING +++ b/core/java/android/os/TEST_MAPPING @@ -27,6 +27,19 @@ ] }, { + "file_patterns": [ + "[^/]*(Vibrator|Vibration)[^/]*\\.java", + "vibrator/.*" + ], + "name": "CtsVibratorTestCases", + "options": [ + {"exclude-annotation": "android.platform.test.annotations.LargeTest"}, + {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "org.junit.Ignore"} + ] + }, + { "file_patterns": ["Bugreport[^/]*\\.java"], "name": "BugreportManagerTestCases", "options": [ diff --git a/services/core/java/com/android/server/vibrator/TEST_MAPPING b/services/core/java/com/android/server/vibrator/TEST_MAPPING index f0a7e470f8fd..92b327d9abff 100644 --- a/services/core/java/com/android/server/vibrator/TEST_MAPPING +++ b/services/core/java/com/android/server/vibrator/TEST_MAPPING @@ -1,21 +1,10 @@ { - "presubmit": [ + "imports": [ { - "name": "FrameworksVibratorServicesTests", - "options": [ - {"exclude-annotation": "android.platform.test.annotations.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - } - ], - "postsubmit": [ + "path": "frameworks/base/services/tests/vibrator" + }, { - "name": "FrameworksVibratorServicesTests", - "options": [ - {"exclude-annotation": "org.junit.Ignore"} - ] + "path": "cts/tests/vibrator" } ] } diff --git a/services/core/jni/TEST_MAPPING b/services/core/jni/TEST_MAPPING new file mode 100644 index 000000000000..ea44d06b9fc3 --- /dev/null +++ b/services/core/jni/TEST_MAPPING @@ -0,0 +1,16 @@ +{ + "presubmit": [ + { + "file_patterns": [ + "[^/]*(vibrator)[^/]*\\.[^/]*" + ], + "name": "CtsVibratorTestCases", + "options": [ + {"exclude-annotation": "android.platform.test.annotations.LargeTest"}, + {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "org.junit.Ignore"} + ] + } + ] +} diff --git a/services/tests/vibrator/TEST_MAPPING b/services/tests/vibrator/TEST_MAPPING index 22b72fa4ff9e..f0a7e470f8fd 100644 --- a/services/tests/vibrator/TEST_MAPPING +++ b/services/tests/vibrator/TEST_MAPPING @@ -1,7 +1,21 @@ { - "imports": [ + "presubmit": [ { - "path": "frameworks/base/services/core/java/com/android/server/vibrator" + "name": "FrameworksVibratorServicesTests", + "options": [ + {"exclude-annotation": "android.platform.test.annotations.LargeTest"}, + {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "org.junit.Ignore"} + ] + } + ], + "postsubmit": [ + { + "name": "FrameworksVibratorServicesTests", + "options": [ + {"exclude-annotation": "org.junit.Ignore"} + ] } ] } |