Support overriding config's command through CLI args

Commit ab25958 added support for oneliners, but it marked the 'command'
arg as conflicting with the 'config' arg. This prevents using a config
file with `go run|test -exec`.

Moreover, having a way to override the command defined in the config
file gives an easy way to exec into a VM to manually debug a failing
command.

Signed-off-by: Albin Kerouanton <[email protected]>

Author: akerouanton

src/main.rs

@@ -45,7 +45,6 @@ struct Args {
     #[clap(short, long, conflicts_with = "config")]
     qemu_command: Option<String>,
     /// Command to run in kernel mode. `-` to get an interactive shell.
-    #[clap(conflicts_with = "config")]
     command: Vec<String>,
 }
 
@@ -135,6 +134,13 @@ fn config(args: &Args) -> Result<Vmtest> {
                 .target
                 .into_iter()
                 .filter(|t| filter.is_match(&t.name))
+                .map(|t| {
+                    let mut t = t;
+                    if !args.command.is_empty() {
+                        t.command = args.command.join(" ");
+                    }
+                    t
+                })
                 .collect::<Vec<_>>();
             let base = config_path.parent().unwrap();
             Vmtest::new(base, config)

tests/test.rs

@@ -393,8 +393,7 @@ fn test_run_custom_resources() {
                 image: Some(uefi_image_t2.as_pathbuf()),
                 uefi: true,
                 // Should be in the 200 thousands, but it's variable.
-                command: r#"bash -xc "cat /proc/meminfo | grep 'MemTotal:         2..... kB'""#
-                    .into(),
+                command: r#"bash -xc "cat /proc/meminfo | grep 'MemTotal:         2..... kB'""#.into(),
                 vm: VMConfig {
                     memory: "256M".into(),
                     ..Default::default()