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

Move CtsContentTestCases to group presubmit-large

Browse Source 
The test config takes longer than 900 seconds to run. Move it to a
dedicated group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Fix: 215431363
Fix: 215549069
Test: treehugger
Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80
Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80
(cherry picked from commit ccc91c4fa9)
This commit is contained in:
Jackal Guo
2021-08-25 16:47:25 +08:00
committed by Felka Chang
parent 6dcb9e28be
commit 7172238add
9 changed files with 105 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/app/TEST_MAPPING
View File

@@ -114,21 +114,6 @@
],
"file_patterns": ["(/|^)VoiceInteract[^/]*"]
},
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.wm.cts"
}
],
"file_patterns": ["(/|^)ContextImpl.java"]
},
{
"name": "CtsOsTestCases",
"options": [
@@ -163,6 +148,23 @@
"file_patterns": ["(/|^)ContextImpl.java"]
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.wm.cts"
}
],
"file_patterns": ["(/|^)ContextImpl.java"]
}
],
"postsubmit": [
{
"file_patterns": ["(/|^)ActivityThreadClientTest.java"],

32
core/java/android/content/TEST_MAPPING
View File

@@ -1,20 +1,5 @@
{
"presubmit": [
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.wm.cts"
}
],
"file_patterns": ["(/|^)Context.java", "(/|^)ContextWrapper.java"]
},
{
"name": "CtsOsTestCases",
"options": [
@@ -51,5 +36,22 @@
],
"file_patterns": ["(/|^)Context.java", "(/|^)ContextWrapper.java", "(/|^)ComponentCallbacksController.java"]
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.wm.cts"
}
],
"file_patterns": ["(/|^)Context.java", "(/|^)ContextWrapper.java"]
}
]
}

4
core/java/android/content/om/TEST_MAPPING
View File

@@ -21,7 +21,9 @@
"include-filter": "android.appsecurity.cts.OverlayHostTest"
}
]
},
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [

18
core/java/android/content/pm/TEST_MAPPING
View File

@@ -18,6 +18,16 @@
{
"name": "CarrierAppIntegrationTestCases"
},
{
"name": "CtsIncrementalInstallHostTestCases",
"options": [
{
"include-filter": "android.incrementalinstall.cts.IncrementalFeatureTest"
}
]
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [
@@ -31,14 +41,6 @@
"include-filter": "android.content.pm.cts"
}
]
},
{
"name": "CtsIncrementalInstallHostTestCases",
"options": [
{
"include-filter": "android.incrementalinstall.cts.IncrementalFeatureTest"
}
]
}
],
"postsubmit": [

4
core/java/android/content/res/TEST_MAPPING
View File

@@ -2,7 +2,9 @@
"presubmit": [
{
"name": "CtsResourcesLoaderTests"
},
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [

18
core/java/android/util/apk/TEST_MAPPING
View File

@@ -1,5 +1,15 @@
{
"presubmit": [
{
"name": "FrameworksCoreTests",
"options": [
{
"include-filter": "android.util.apk.SourceStampVerifierTest"
}
]
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [
@@ -10,14 +20,6 @@
"include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
}
]
},
{
"name": "FrameworksCoreTests",
"options": [
{
"include-filter": "android.util.apk.SourceStampVerifierTest"
}
]
}
]
}

30
services/core/java/com/android/server/TEST_MAPPING
View File

@@ -22,21 +22,6 @@
],
"file_patterns": ["NotificationManagerService\\.java"]
},
{
"name": "CtsContentTestCases",
"options": [
{
"include-filter": "android.content.cts.ClipboardManagerTest"
},
{
"include-filter": "android.content.cts.ClipDataTest"
},
{
"include-filter": "android.content.cts.ClipDescriptionTest"
}
],
"file_patterns": ["ClipboardService\\.java"]
},
{
"name": "FrameworksMockingServicesTests",
"options": [
@@ -59,6 +44,21 @@
{
"name": "CtsScopedStorageDeviceOnlyTest",
"file_patterns": ["StorageManagerService\\.java"]
},
{
"name": "CtsContentTestCases",
"options": [
{
"include-filter": "android.content.cts.ClipboardManagerTest"
},
{
"include-filter": "android.content.cts.ClipDataTest"
},
{
"include-filter": "android.content.cts.ClipDescriptionTest"
}
],
"file_patterns": ["ClipboardService\\.java"]
}
]
}

30
services/core/java/com/android/server/pm/TEST_MAPPING
View File

@@ -40,20 +40,6 @@
}
]
},
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.pm.cts"
}
]
},
{
"name": "GtsContentTestCases",
"options": [
@@ -107,6 +93,22 @@
]
}
],
"presubmit-large": [
{
"name": "CtsContentTestCases",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "org.junit.Ignore"
},
{
"include-filter": "android.content.pm.cts"
}
]
}
],
"postsubmit": [
{
"name": "CtsPermissionTestCases",

28
services/incremental/TEST_MAPPING
View File

@@ -1,19 +1,5 @@
{
"presubmit": [
{
"name": "CtsContentTestCases",
"options": [
{
"include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
},
{
"include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest"
},
{
"include-filter": "android.content.pm.cts.ChecksumsTest"
}
]
},
{
"name": "CtsPackageManagerStatsHostTestCases",
"options": [
@@ -29,6 +15,20 @@
"presubmit-large": [
{
"name": "CtsInstalledLoadingProgressHostTests"
},
{
"name": "CtsContentTestCases",
"options": [
{
"include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
},
{
"include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest"
},
{
"include-filter": "android.content.pm.cts.ChecksumsTest"
}
]
}
]
}