Merge "Revert^2 "Update test mapping for all headroom tests"" into main (3beebd9b) · Commits · e / os / android_frameworks_base

core/java/android/os/TEST_MAPPING

+26 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,32 @@
		{
		"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": [

+14 −0

Original line number	Diff line number	Diff line
		@@ -25,5 +25,19 @@
		"name": "NativeThermalUnitTestCases",
		"file_patterns": ["thermal.cpp"]
		}
		],
		"postsubmit": [
		{
		"file_patterns": ["system_health.cpp"],
		"name": "NativeSystemHealthUnitTestCases"
		},
		{
		"file_patterns": ["system_health.cpp"],
		"name": "CtsSystemHealthTestCases",
		"options": [
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "org.junit.Ignore"}
		]
		}
		]
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -15,5 +15,22 @@
		{"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