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

core/java/android/os/TEST_MAPPING

+0 −26

Original line number	Diff line number	Diff line
		@@ -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": [

+0 −16

Original line number	Diff line number	Diff line
		@@ -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"}
		]
		}
		]
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -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