9a689f81f4
Replace SkipPresubmit with RequiresDevice on relevant tests, as RequiresDevices is more standard and more specific. This allows creating test configurations using virtual devices which are not necessarily in presubmit. Bug: 201014262 Test: TH needs to verify test mapping run with new annotation Change-Id: I6758d2a41a9a987a5244e47e4795bc49889c4d61
77 lines
2.1 KiB
Plaintext
77 lines
2.1 KiB
Plaintext
{
|
|
"presubmit": [
|
|
{
|
|
"name": "ConnectivityCoverageTests"
|
|
},
|
|
// Run in addition to mainline-presubmit as mainline-presubmit is not
|
|
// supported in every branch.
|
|
// CtsNetTestCasesLatestSdk uses stable API shims, so does not exercise
|
|
// some latest APIs. Run CtsNetTestCases to get coverage of newer APIs.
|
|
{
|
|
"name": "CtsNetTestCases",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "TetheringTests"
|
|
},
|
|
{
|
|
"name": "TetheringIntegrationTests"
|
|
}
|
|
],
|
|
"postsubmit": [
|
|
{
|
|
"name": "TetheringPrivilegedTests"
|
|
}
|
|
],
|
|
"mainline-presubmit": [
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"options": [
|
|
{
|
|
"exclude-annotation": "com.android.testutils.SkipPresubmit"
|
|
},
|
|
{
|
|
"exclude-annotation": "androidx.test.filters.RequiresDevice"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "ConnectivityCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
}
|
|
],
|
|
"mainline-postsubmit": [
|
|
// Tests on physical devices with SIM cards: postsubmit only for capacity constraints
|
|
{
|
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
|
"keywords": ["sim"]
|
|
},
|
|
{
|
|
"name": "TetheringCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
|
}
|
|
],
|
|
"imports": [
|
|
{
|
|
"path": "frameworks/base/core/java/android/net"
|
|
},
|
|
{
|
|
"path": "packages/modules/NetworkStack"
|
|
},
|
|
{
|
|
"path": "packages/modules/CaptivePortalLogin"
|
|
},
|
|
{
|
|
"path": "packages/modules/Connectivity"
|
|
},
|
|
{
|
|
"path": "packages/modules/Connectivity/Tethering"
|
|
}
|
|
]
|
|
}
|