diff options
| author | 2025-01-13 23:46:10 -0800 | |
|---|---|---|
| committer | 2025-01-13 23:46:10 -0800 | |
| commit | ab9c80e6b30fa39dea5780f74aa717d05c97862e (patch) | |
| tree | 2c973769341cab131f513b3edce97b83cf1fbbb0 | |
| parent | beca2c45b220e0b2ac70c2d9d51c47237c41eb6a (diff) | |
| parent | d4fd3235109ce4a72f3758013fe89685ed641ba8 (diff) | |
Merge "Revert "Update test mapping for all headroom tests"" into main
| -rw-r--r-- | core/java/android/os/TEST_MAPPING | 26 | ||||
| -rw-r--r-- | native/android/TEST_MAPPING | 16 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/hint/TEST_MAPPING | 17 |
3 files changed, 0 insertions, 59 deletions
diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING index 48fa0c8277df..effe5554aff4 100644 --- a/core/java/android/os/TEST_MAPPING +++ b/core/java/android/os/TEST_MAPPING @@ -112,32 +112,6 @@ { "file_patterns": ["Bugreport[^/]*\\.java"], "name": "ShellTests" - }, - { - "file_patterns": [ - "CpuHeadroom[^/]*", - "GpuHeadroom[^/]*", - "health/SystemHealthManager\\.java" - ], - "name": "CtsOsTestCases", - "options": [ - {"include-filter": "android.os.health.cts.HeadroomTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - }, - { - "file_patterns": [ - "CpuHeadroom[^/]*", - "GpuHeadroom[^/]*", - "health/SystemHealthManager\\.java" - ], - "name": "FrameworksCoreTests", - "options": [ - {"include-filter": "android.os.SystemHealthManagerUnitTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] } ], "ravenwood-presubmit": [ diff --git a/native/android/TEST_MAPPING b/native/android/TEST_MAPPING index e40af595f248..70560a84b88e 100644 --- a/native/android/TEST_MAPPING +++ b/native/android/TEST_MAPPING @@ -24,22 +24,6 @@ { "name": "NativeThermalUnitTestCases", "file_patterns": ["thermal.cpp"] - }, - { - "file_patterns": ["system_health.cpp"], - "name": "NativeSystemHealthUnitTestCases", - "options": [ - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - }, - { - "file_patterns": ["system_health.cpp"], - "name": "CtsSystemHealthTestCases", - "options": [ - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] } ] } diff --git a/services/core/java/com/android/server/power/hint/TEST_MAPPING b/services/core/java/com/android/server/power/hint/TEST_MAPPING index fd81277e9ba4..545070050977 100644 --- a/services/core/java/com/android/server/power/hint/TEST_MAPPING +++ b/services/core/java/com/android/server/power/hint/TEST_MAPPING @@ -15,22 +15,5 @@ {"exclude-annotation": "org.junit.Ignore"} ] } - ], - "postsubmit": [ - { - "name": "CtsSystemHealthTestCases", - "options": [ - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - }, - { - "name": "CtsOsTestCases", - "options": [ - {"include-filter": "android.os.health.cts.HeadroomTest"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "org.junit.Ignore"} - ] - } ] }
\ No newline at end of file |