Merge "Point test mappings to new suites." into main

This commit is contained in:
Alex Buynytskyy
2023-07-14 03:35:39 +00:00
committed by Android (Google) Code Review
8 changed files with 25 additions and 45 deletions

View File

@@ -18,12 +18,7 @@
"name": "OverlayHostTests"
},
{
"name": "CtsAppSecurityHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.OverlayHostTest"
}
]
"name": "CtsOverlayHostTestCases"
}
],
"presubmit-large": [

View File

@@ -97,6 +97,23 @@
"include-filter":"android.incrementalinstall.cts.IncrementalFeatureTest"
}
]
},
{
"name":"CtsPackageManagerHostTestCases",
"options":[
{
"include-annotation":"android.platform.test.annotations.Presubmit"
},
{
"exclude-annotation":"android.platform.test.annotations.Postsubmit"
},
{
"exclude-annotation":"androidx.test.filters.FlakyTest"
},
{
"exclude-annotation":"org.junit.Ignore"
}
]
}
],
"presubmit-large":[
@@ -135,23 +152,6 @@
"exclude-annotation":"org.junit.Ignore"
}
]
},
{
"name":"CtsAppSecurityHostTestCases",
"options":[
{
"include-annotation":"android.platform.test.annotations.Presubmit"
},
{
"exclude-annotation":"android.platform.test.annotations.Postsubmit"
},
{
"exclude-annotation":"androidx.test.filters.FlakyTest"
},
{
"exclude-annotation":"org.junit.Ignore"
}
]
}
],
"postsubmit":[

View File

@@ -21,7 +21,7 @@
"name": "SettingsProviderTest"
},
{
"name": "CtsAppSecurityHostTestCases",
"name": "CtsPackageManagerHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.ReadableSettingsFieldsTest"

View File

@@ -20,12 +20,7 @@
"file_patterns": ["VerityUtils\\.java"]
},
{
"name": "CtsAppSecurityHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.ApkVerityInstallTest"
}
],
"name": "CtsApkVerityInstallHostTestCases",
"file_patterns": ["VerityUtils\\.java"]
}
]

View File

@@ -145,12 +145,7 @@
]
},
{
"name": "CtsAppSecurityHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.AppDataIsolationTests"
}
]
"name": "CtsAppDataIsolationHostTestCases"
},
{
"name": "CtsAppTestCases",

View File

@@ -15,12 +15,7 @@
"name": "OverlayHostTests"
},
{
"name": "CtsAppSecurityHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.OverlayHostTest"
}
]
"name": "CtsOverlayHostTestCases"
}
],
"presubmit-large": [

View File

@@ -90,7 +90,7 @@
]
},
{
"name": "CtsAppSecurityHostTestCases",
"name": "CtsInstantAppsHostTestCases",
"file_patterns": ["(/|^)PackageMonitorCallbackHelper\\.java"],
"options": [
{
@@ -125,7 +125,7 @@
]
},
{
"name": "CtsAppSecurityHostTestCases"
"name": "CtsPackageManagerHostTestCases"
},
{
"name": "PackageManagerServiceHostTests"

View File

@@ -9,7 +9,7 @@
]
},
{
"name": "CtsAppSecurityHostTestCases",
"name": "CtsStorageHostTestCases",
"options": [
{
"include-filter": "android.appsecurity.cts.ExternalStorageHostTest#testGrantUriPermission"