summaryrefslogtreecommitdiff
path: root/tests/ApkVerityTest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ApkVerityTest')
-rw-r--r--tests/ApkVerityTest/AndroidTest.xml2
-rw-r--r--tests/ApkVerityTest/TEST_MAPPING9
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/ApkVerityTest/AndroidTest.xml b/tests/ApkVerityTest/AndroidTest.xml
index 51bcdea21f49..55704eda905e 100644
--- a/tests/ApkVerityTest/AndroidTest.xml
+++ b/tests/ApkVerityTest/AndroidTest.xml
@@ -22,7 +22,7 @@
<target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
<!-- Disable package verifier prevents it holding the target APK's fd that prevents cache
eviction. -->
- <option name="set-global-setting" key="package_verifier_enable" value="0" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
<option name="restore-settings" value="true" />
<!-- Skip in order to prevent reboot that confuses the test flow. -->
diff --git a/tests/ApkVerityTest/TEST_MAPPING b/tests/ApkVerityTest/TEST_MAPPING
index a6608399d83c..72d96148c69f 100644
--- a/tests/ApkVerityTest/TEST_MAPPING
+++ b/tests/ApkVerityTest/TEST_MAPPING
@@ -1,15 +1,12 @@
{
"presubmit": [
+ {
+ "name": "ApkVerityTest"
+ },
// nextgen test only runs during postsubmit.
{
"name": "ApkVerityTest",
"keywords": ["nextgen"]
}
- ],
- "postsubmit": [
- // TODO: move to presubmit once it's confirmed stable.
- {
- "name": "ApkVerityTest"
- }
]
}