Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add TEST_MAPPING for displayservicetests" into udc-qpr-dev

Browse Source
This commit is contained in:
Fiona Campbell
2023-07-25 11:46:49 +00:00
committed by Android (Google) Code Review
parent 9958309dac 150b8d7d85
commit c5c66d40ed
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/display/TEST_MAPPING
View File

@@ -1,15 +1,7 @@
{ {
"presubmit": [ "presubmit": [
{ {
"name": "FrameworksMockingServicesTests", "name": "DisplayServiceTests",
"options": [
{"include-filter": "com.android.server.display"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"}
]
},
{
"name": "FrameworksServicesTests",
"options": [ "options": [
{"include-filter": "com.android.server.display"}, {"include-filter": "com.android.server.display"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
@@ -31,5 +23,14 @@
} }
] ]
} }
],
"postsubmit": [
{
"name": "DisplayServiceTests",
"options": [
{"include-filter": "com.android.server.display"},
{"exclude-annotation": "org.junit.Ignore"}
]
}
] ]
} }

10
services/tests/displayservicetests/TEST_MAPPING
View File

@@ -1,13 +1,7 @@
{ {
"presubmit": [ "imports": [
{ {
"name": "DisplayServiceTests", "path": "frameworks/base/services/core/java/com/android/server/display"
"options": [
{"include-filter": "com.android.server.display"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "org.junit.Ignore"}
]
} }
] ]
} }