Add our integration tests to cts
Note: per_testcase_directory: true is added to the two tests sharing
MicrodroidTestApp as a support file. This is needed to avoid having
duplicated install rules for the app file. Without that, we hit
build/make/core/main.mk:1430: error: overriding commands for target
`out/host/linux-x86/cts/android-cts/testcases/MicrodroidTestApp.apk',
previously defined at build/make/core/main.mk:1430
Bug: 204979196
Test: check android-cts-tests_list.zip in the test_suites_[arm64|x86_64]
targets to see if the added tests are here.
Change-Id: Idcea518db04407da993d866b114f17f90be20209
diff --git a/tests/testapk/AndroidTest.xml b/tests/testapk/AndroidTest.xml
index c7097db..e8bb1aa 100644
--- a/tests/testapk/AndroidTest.xml
+++ b/tests/testapk/AndroidTest.xml
@@ -14,7 +14,12 @@
limitations under the License.
-->
<configuration description="Runs sample instrumentation test.">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="security" />
+ <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" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="test-file-name" value="MicrodroidTestApp.apk" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">