diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-17 21:09:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-17 21:09:39 +0000 |
| commit | 23382e02a3d2aa62975aecff8c11b3bbe43b46de (patch) | |
| tree | b6df96ea25517967d6e88ee2eaa4cc29dd94ffcc | |
| parent | 25b55522bc27be4bde5df4cbb9af6f9def9343dc (diff) | |
| parent | 3269fda1cdcaca9b226f6faedc0ef18f5bbe4828 (diff) | |
| download | cts-23382e02a3d2aa62975aecff8c11b3bbe43b46de.tar.gz | |
Merge "Suppress AppSearch MTS tests on S and below." into tm-dev
| -rw-r--r-- | hostsidetests/appsearch/AndroidTest.xml | 6 | ||||
| -rw-r--r-- | tests/appsearch/AndroidTest.xml | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/hostsidetests/appsearch/AndroidTest.xml b/hostsidetests/appsearch/AndroidTest.xml index a5389162fda..8bd1dc05179 100644 --- a/hostsidetests/appsearch/AndroidTest.xml +++ b/hostsidetests/appsearch/AndroidTest.xml @@ -20,16 +20,22 @@ <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" /> <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <option name="config-descriptor:metadata" key="parameter" value="secondary_user" /> + <test class="com.android.tradefed.testtype.HostTest" > <option name="jar" value="CtsAppSearchHostTestCases.jar" /> </test> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <option name="test-file-name" value="CtsAppSearchHostTestHelperA.apk" /> <option name="test-file-name" value="CtsAppSearchHostTestHelperB.apk" /> <option name="cleanup-apks" value="true" /> </target_preparer> + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> <option name="mainline-module-package-name" value="com.google.android.appsearch" /> </object> + + <object type="module_controller" + class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" /> </configuration> diff --git a/tests/appsearch/AndroidTest.xml b/tests/appsearch/AndroidTest.xml index 245569d6c6b..ac13ee3a368 100644 --- a/tests/appsearch/AndroidTest.xml +++ b/tests/appsearch/AndroidTest.xml @@ -37,4 +37,7 @@ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> <option name="mainline-module-package-name" value="com.google.android.appsearch" /> </object> + + <object type="module_controller" + class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" /> </configuration> |