pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't switch pKVM status with adb over IP"

This commit is contained in:
Victor Hsieh 2023-03-30 15:10:25 +00:00 committed by Gerrit Code Review
parent 43e9b428ba 122abdc834
commit 909c931859
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
View File

@ -85,10 +85,13 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
private boolean mNeedTearDown = false; private boolean mNeedTearDown = false;
private boolean mNeedToRestartPkvmStatus = false;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
testIfDeviceIsCapable(getDevice()); testIfDeviceIsCapable(getDevice());
mNeedTearDown = true; mNeedTearDown = true;
mNeedToRestartPkvmStatus = false;
getDevice().installPackage(findTestFile(APK_NAME), /* reinstall */ false); getDevice().installPackage(findTestFile(APK_NAME), /* reinstall */ false);
@ -103,8 +106,8 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
// sees, so we can't rely on that - b/268688303.) // sees, so we can't rely on that - b/268688303.)
return; return;
} }
// Set PKVM enable and reboot to prevent previous staged session. // Restore PKVM status and reboot to prevent previous staged session, if switched.
if (!isCuttlefish()) { if (mNeedToRestartPkvmStatus) {
setPKVMStatusWithRebootToBootloader(true); setPKVMStatusWithRebootToBootloader(true);
rebootFromBootloaderAndWaitBootCompleted(); rebootFromBootloaderAndWaitBootCompleted();
} }
@ -422,7 +425,7 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
} }
private void enableDisablePKVMTestHelper(boolean isEnable) throws Exception { private void enableDisablePKVMTestHelper(boolean isEnable) throws Exception {
skipIfPKVMStatusSwitchNotSupported(); assumePKVMStatusSwitchSupported();
List<Double> bootDmesgTime = new ArrayList<>(ROUND_COUNT); List<Double> bootDmesgTime = new ArrayList<>(ROUND_COUNT);
Map<String, List<Double>> bootloaderTime = new HashMap<>(); Map<String, List<Double>> bootloaderTime = new HashMap<>();
@ -478,9 +481,16 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
reportMetric(bootDmesgTime, "dmesg_boot_time_" + suffix, "s"); reportMetric(bootDmesgTime, "dmesg_boot_time_" + suffix, "s");
} }
private void skipIfPKVMStatusSwitchNotSupported() throws Exception { private void assumePKVMStatusSwitchSupported() throws Exception {
assumeFalse("Skip on CF; can't reboot to bootloader", isCuttlefish()); assumeFalse("Skip on CF; can't reboot to bootloader", isCuttlefish());
// This is an overkill. The intention is to exclude remote_device_proxy, which uses
// different serial for fastboot. But there's no good way to distinguish from regular IP
// transport. This is currently not a problem until someone really needs to run the test
// over regular IP transport.
boolean isAdbOverIp = getDevice().getSerialNumber().contains(":");
assumeFalse("Skip over IP (overkill for remote_device_proxy)", isAdbOverIp);
if (!getDevice().isStateBootloaderOrFastbootd()) { if (!getDevice().isStateBootloaderOrFastbootd()) {
getDevice().rebootIntoBootloader(); getDevice().rebootIntoBootloader();
} }
@ -513,6 +523,7 @@ public final class AVFHostTestCase extends MicrodroidHostTestCaseBase {
} }
private void setPKVMStatusWithRebootToBootloader(boolean isEnable) throws Exception { private void setPKVMStatusWithRebootToBootloader(boolean isEnable) throws Exception {
mNeedToRestartPkvmStatus = true;
if (!getDevice().isStateBootloaderOrFastbootd()) { if (!getDevice().isStateBootloaderOrFastbootd()) {
getDevice().rebootIntoBootloader(); getDevice().rebootIntoBootloader();