diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 02:48:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-16 02:48:20 +0000 |
| commit | bb6e22bb00f7d7a0ecf3030061776d47431265ef (patch) | |
| tree | be0bb22269fa7080563124271f1862904f4871b1 | |
| parent | 8d8a2bd0396acdabf447f9dfddf993111777f431 (diff) | |
| parent | 31e49de0ba8f25ca61d8ecb83dec82e14f0c87a7 (diff) | |
| download | cts-bb6e22bb00f7d7a0ecf3030061776d47431265ef.tar.gz | |
Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" into rvc-dev
| -rw-r--r-- | tests/tests/net/Android.bp | 2 | ||||
| -rw-r--r-- | tests/tests/net/AndroidTestTemplate.xml | 2 | ||||
| -rw-r--r-- | tests/tests/net/TEST_MAPPING | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/tests/tests/net/Android.bp b/tests/tests/net/Android.bp index 112799b7169..7eaf1330998 100644 --- a/tests/tests/net/Android.bp +++ b/tests/tests/net/Android.bp @@ -83,7 +83,7 @@ android_test { min_sdk_version: "29", target_sdk_version: "30", test_suites: [ - "device-tests", + "general-tests", "mts", ], test_config_template: "AndroidTestTemplate.xml", diff --git a/tests/tests/net/AndroidTestTemplate.xml b/tests/tests/net/AndroidTestTemplate.xml index 1f75da18600..4e937512ad2 100644 --- a/tests/tests/net/AndroidTestTemplate.xml +++ b/tests/tests/net/AndroidTestTemplate.xml @@ -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" /> diff --git a/tests/tests/net/TEST_MAPPING b/tests/tests/net/TEST_MAPPING index e2a9c757784..3162e22378d 100644 --- a/tests/tests/net/TEST_MAPPING +++ b/tests/tests/net/TEST_MAPPING @@ -9,5 +9,15 @@ } ] } + ], + "mainline-presubmit": [ + { + "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]", + "options": [ + { + "exclude-annotation": "com.android.testutils.SkipPresubmit" + } + ] + } ] } |