xtask: add command for running unit tests under Miri

Author: nicholasbishop

xtask/src/cargo.rs

@@ -82,6 +82,7 @@ pub enum CargoAction {
     Build,
     Clippy,
     Doc { open: bool },
+    Miri,
     Test,
 }
 
@@ -105,6 +106,7 @@ impl Cargo {
         }
 
         let action;
+        let mut sub_action = None;
         let mut extra_args: Vec<&str> = Vec::new();
         let mut tool_args: Vec<&str> = Vec::new();
         match self.action {
@@ -126,11 +128,18 @@ impl Cargo {
                     extra_args.push("--open");
                 }
             }
+            CargoAction::Miri => {
+                action = "miri";
+                sub_action = Some("test");
+            }
             CargoAction::Test => {
                 action = "test";
             }
         };
         cmd.arg(action);
+        if let Some(sub_action) = sub_action {
+            cmd.arg(sub_action);
+        }
 
         if self.release {
             cmd.arg("--release");

xtask/src/main.rs

@@ -7,7 +7,7 @@ mod util;
 use anyhow::Result;
 use cargo::{Cargo, CargoAction, Feature, Package};
 use clap::Parser;
-use opt::{Action, BuildOpt, ClippyOpt, DocOpt, Opt, QemuOpt};
+use opt::{Action, BuildOpt, ClippyOpt, DocOpt, MiriOpt, Opt, QemuOpt};
 use std::process::Command;
 use tempfile::TempDir;
 use util::{command_to_string, run_cmd};
@@ -67,6 +67,20 @@ fn doc(opt: &DocOpt) -> Result<()> {
     run_cmd(cargo.command()?)
 }
 
+/// Run unit tests and doctests under Miri.
+fn run_miri(opt: &MiriOpt) -> Result<()> {
+    let cargo = Cargo {
+        action: CargoAction::Miri,
+        features: [Feature::Exts].into(),
+        toolchain: opt.toolchain.or(NIGHTLY),
+        packages: [Package::Uefi].into(),
+        release: false,
+        target: None,
+        warnings_as_errors: false,
+    };
+    run_cmd(cargo.command()?)
+}
+
 /// Build uefi-test-runner and run it in QEMU.
 fn run_vm_tests(opt: &QemuOpt) -> Result<()> {
     let mut features = vec![Feature::Qemu];
@@ -154,6 +168,7 @@ fn main() -> Result<()> {
         Action::Build(build_opt) => build(build_opt),
         Action::Clippy(clippy_opt) => clippy(clippy_opt),
         Action::Doc(doc_opt) => doc(doc_opt),
+        Action::Miri(miri_opt) => run_miri(miri_opt),
         Action::Run(qemu_opt) => run_vm_tests(qemu_opt),
         Action::Test(_) => run_host_tests(),
         Action::TestLatestRelease(_) => test_latest_release(),

xtask/src/opt.rs

@@ -63,6 +63,7 @@ pub enum Action {
     Build(BuildOpt),
     Clippy(ClippyOpt),
     Doc(DocOpt),
+    Miri(MiriOpt),
     Run(QemuOpt),
     Test(TestOpt),
     TestLatestRelease(TestLatestReleaseOpt),
@@ -108,6 +109,13 @@ pub struct DocOpt {
     pub warning: WarningOpt,
 }
 
+/// Run unit tests and doctests under Miri.
+#[derive(Debug, Parser)]
+pub struct MiriOpt {
+    #[clap(flatten)]
+    pub toolchain: ToolchainOpt,
+}
+
 /// Build uefi-test-runner and run it in QEMU.
 #[derive(Debug, Parser)]
 pub struct QemuOpt {