660c5eee79
Without this change, the verifier may hold the fd of installed apk and
prevents the cache eviction. The existing retry loop up to 5 seconds is
not sufficient.
Also removed an obsolete verifier setting.
Test: com.android.apkverity.ApkVerityTest#testInstallSplitOnly succeeded
100% (75+ times).
Bug: 146350859
Change-Id: Ia7d42ab6efcb42de83626f1d63bff5a8adc6c1a6
42 lines
1.9 KiB
XML
42 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2019 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
<configuration description="APK fs-verity integration/regression test">
|
|
<option name="test-suite-tag" value="apct" />
|
|
|
|
<!-- This test requires root to write against block device. -->
|
|
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
|
|
|
|
<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="verifier_verify_adb_installs" value="0" />
|
|
<option name="restore-settings" value="true" />
|
|
|
|
<!-- Skip in order to prevent reboot that confuses the test flow. -->
|
|
<option name="force-skip-system-props" value="true" />
|
|
</target_preparer>
|
|
|
|
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
|
|
<option name="cleanup" value="true" />
|
|
<option name="push" value="block_device_writer->/data/local/tmp/block_device_writer" />
|
|
<option name="push" value="ApkVerityTestCert.der->/data/local/tmp/ApkVerityTestCert.der" />
|
|
</target_preparer>
|
|
|
|
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
|
|
<option name="jar" value="ApkVerityTest.jar" />
|
|
</test>
|
|
</configuration>
|