LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" am: ce5d7c09ab am: 8d12e31a62 am: 0a5ad58f9c am: 372b0dc336

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331100

Change-Id: Ie33231c670b2c12095c4925b67e499c230a0b7c1
This commit is contained in:
Treehugger Robot
2020-07-13 02:40:26 +00:00
committed by Automerger Merge Worker
parent 5749ffc9b0 372b0dc336
commit 1eb20bb743
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/Android.bp
View File

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

2
tests/cts/net/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="instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <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="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" />
<option name="not-shardable" value="true" /> <option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" /> <option name="cleanup-apks" value="true" />

10
tests/cts/net/TEST_MAPPING
View File

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