Revert^2 "Add odsign_e2e_tests to CTS."
This reverts commit afbb15209f9dd248ceb9a222cd4dd52dc473884a.
Reason for revert: The test can now pass on user builds with some test cases that require root access skipped.
Bug: 214016309
Test: Presubmits
Change-Id: Iea63e20198dab8af52babc89af41b8051d837c2f
diff --git a/test/odsign/Android.bp b/test/odsign/Android.bp
index a0b6d2e..f4a1d88 100644
--- a/test/odsign/Android.bp
+++ b/test/odsign/Android.bp
@@ -30,7 +30,10 @@
":odsign_e2e_test_app",
],
test_config: "odsign-e2e-tests.xml",
- test_suites: ["device-tests"],
+ test_suites: [
+ "device-tests",
+ "cts",
+ ],
}
cc_library_shared {
diff --git a/test/odsign/odsign-e2e-tests.xml b/test/odsign/odsign-e2e-tests.xml
index 6028945..37dc513 100644
--- a/test/odsign/odsign-e2e-tests.xml
+++ b/test/odsign/odsign-e2e-tests.xml
@@ -16,6 +16,12 @@
<configuration description="Config for on-device signing ART e2e test cases">
<option name="test-suite-tag" value="odsign_e2e_tests" />
<option name="test-suite-tag" value="apct" />
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="art" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+ <!-- odsign runs on early boot, so multi-user doesn't apply. -->
+ <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<test class="com.android.tradefed.testtype.HostTest" >