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 am: c5c66d40ed

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24161067

Change-Id: I49010ce4c57f14fe0256481bcc3a9cafc9b6737e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fiona Campbell
2023-07-25 12:22:02 +00:00
committed by Automerger Merge Worker
parent abc6710cd4 c5c66d40ed
commit 6f71f8a6c1
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,7 @@
{
"presubmit": [
{
"name": "FrameworksMockingServicesTests",
"options": [
{"include-filter": "com.android.server.display"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"}
]
},
{
"name": "FrameworksServicesTests",
"name": "DisplayServiceTests",
"options": [
{"include-filter": "com.android.server.display"},
{"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",
"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"}
]
"path": "frameworks/base/services/core/java/com/android/server/display"
}
]
}