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

Add back "compos_verify --instance pending" 

I removed this in commit
6542fdd76c. It's not needed in
production, but it turns out it's very useful for testing VM start
times without having to reboot.

Bug: 220824234
Test: composd_cmd staged-apex-compile; compos_verify --instance pending
Change-Id: Ie38f70ca5a71b55bdb05ebdd437b2e55feb429b5
This commit is contained in:
Alan Stokes 2022-03-14 14:59:42 +00:00
parent 5cd312a4e1
commit 32d8fa51af
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compos/verify/verify.rs
View File

@ -22,7 +22,8 @@ use anyhow::{bail, Context, Result};
use compos_aidl_interface::binder::ProcessState;
use compos_common::compos_client::{VmInstance, VmParameters};
use compos_common::odrefresh::{
CURRENT_ARTIFACTS_SUBDIR, ODREFRESH_OUTPUT_ROOT_DIR, TEST_ARTIFACTS_SUBDIR,
CURRENT_ARTIFACTS_SUBDIR, ODREFRESH_OUTPUT_ROOT_DIR, PENDING_ARTIFACTS_SUBDIR,
TEST_ARTIFACTS_SUBDIR,
};
use compos_common::{
COMPOS_DATA_ROOT, CURRENT_INSTANCE_DIR, IDSIG_FILE, IDSIG_MANIFEST_APK_FILE,
@ -62,7 +63,7 @@ fn try_main() -> Result<()> {
.long("instance")
.takes_value(true)
.required(true)
.possible_values(&["current", "test"]),
.possible_values(&["current", "pending", "test"]),
)
.arg(clap::Arg::with_name("debug").long("debug"))
.get_matches();
@ -70,6 +71,7 @@ fn try_main() -> Result<()> {
let debug_mode = matches.is_present("debug");
let (instance_dir, artifacts_dir) = match matches.value_of("instance").unwrap() {
"current" => (CURRENT_INSTANCE_DIR, CURRENT_ARTIFACTS_SUBDIR),
"pending" => (CURRENT_INSTANCE_DIR, PENDING_ARTIFACTS_SUBDIR),
"test" => (TEST_INSTANCE_DIR, TEST_ARTIFACTS_SUBDIR),
_ => unreachable!("Unexpected instance name"),
};