Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit"

This commit is contained in:
Treehugger Robot
2020-07-10 00:36:44 +00:00
committed by Gerrit Code Review
3 changed files with 13 additions and 1 deletions

View File

@@ -83,7 +83,7 @@ android_test {
min_sdk_version: "29",
target_sdk_version: "29",
test_suites: [
"device-tests",
"general-tests",
"mts",
],
test_config_template: "AndroidTestTemplate.xml",

View File

@@ -19,6 +19,8 @@
<option name="config-descriptor:metadata" key="parameter" value="instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" />
<option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />

View File

@@ -9,5 +9,15 @@
}
]
}
],
"mainline-presubmit": [
{
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]",
"options": [
{
"exclude-annotation": "com.android.testutils.SkipPresubmit"
}
]
}
]
}