commit 32d8fa51afaf22b067182e4dca5cc333455b1414
author Alan Stokes <alanstokes@google.com> Mon Mar 14 14:59:42 2022 +0000
committer Alan Stokes <alanstokes@google.com> Mon Mar 14 14:59:42 2022 +0000
tree e74d87215d7631796ef5993aa3e289d2a1c8981b
parent 5cd312a4e1c2364efc1e97aa5a96df6b00c874b5

Add back "compos_verify --instance pending"

I removed this in commit
6542fdd76c736f6b8c8fade02cdad285f23e5397. 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

compos/verify/verify.rs

diff --git a/compos/verify/verify.rs b/compos/verify/verify.rs
index 4dc9954..7b77c18 100644
--- a/compos/verify/verify.rs
+++ b/compos/verify/verify.rs
@@ -22,7 +22,8 @@
 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 @@
                 .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 @@
     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"),
     };