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

Merge "Avoid including com.android.server.power.stats in presubmit twice" into udc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-28 18:45:05 +00:00
committed by Android (Google) Code Review
parent 1a16cbcfa0 1814dffd1c
commit 61a737c63a
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/os/TEST_MAPPING
View File

@@ -52,8 +52,20 @@
],
"name": "FrameworksServicesTests",
"options": [
{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" },
{ "include-filter": "com.android.server.power.stats.BatteryStatsTests" }
{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" }
]
},
{
"file_patterns": [
"BatteryStats[^/]*\\.java",
"BatteryUsageStats[^/]*\\.java",
"PowerComponents\\.java",
"[^/]*BatteryConsumer[^/]*\\.java"
],
"name": "FrameworksServicesTests",
"options": [
{ "include-filter": "com.android.server.power.stats" },
{ "exclude-filter": "com.android.server.power.stats.BatteryStatsTests" }
]
},
{

4
services/core/java/com/android/server/power/TEST_MAPPING
View File

@@ -20,6 +20,7 @@
"name": "FrameworksServicesTests",
"options": [
{"include-filter": "com.android.server.power"},
{"exclude-filter": "com.android.server.power.BatteryStatsTests"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"}
]
@@ -38,7 +39,8 @@
{
"name": "FrameworksServicesTests",
"options": [
{"include-filter": "com.android.server.power"}
{"include-filter": "com.android.server.power"},
{"exclude-filter": "com.android.server.power.BatteryStatsTests"}
]
}
]