From 5aecd2811e65f3d238e68ced6bf9fddac7bb25c2 Mon Sep 17 00:00:00 2001 From: Smitty Date: Sat, 11 Sep 2021 12:00:59 -0400 Subject: [PATCH] One character aliases for cargo-miri run/test The main `cargo` command supports `cargo r` as an alias for `cargo run`, and `cargo t` as an alias for `cargo test`. This adds support to them in cargo-miri for consistency. --- cargo-miri/bin.rs | 8 ++++---- test-cargo-miri/run-test.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs index 23546988daa8..21f53a45e41f 100644 --- a/cargo-miri/bin.rs +++ b/cargo-miri/bin.rs @@ -20,8 +20,8 @@ Usage: cargo miri [subcommand] [...] [--] [...] Subcommands: - run Run binaries - test Run tests + run, r Run binaries + test, t Run tests setup Only perform automatic setup, but without asking questions (for getting a proper libstd) The cargo options are exactly the same as for `cargo run` and `cargo test`, respectively. @@ -524,8 +524,8 @@ fn phase_cargo_miri(mut args: env::Args) { // We cannot know which of those flags take arguments and which do not, // so we cannot detect subcommands later. let subcommand = match args.next().as_deref() { - Some("test") => MiriCommand::Test, - Some("run") => MiriCommand::Run, + Some("test" | "t") => MiriCommand::Test, + Some("run" | "r") => MiriCommand::Run, Some("setup") => MiriCommand::Setup, // Invalid command. _ => diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py index 81a1b1b3f8a7..db8f6049900e 100755 --- a/test-cargo-miri/run-test.py +++ b/test-cargo-miri/run-test.py @@ -102,6 +102,11 @@ def test_cargo_miri_run(): "run.subcrate.stdout.ref", "run.subcrate.stderr.ref", env={'MIRIFLAGS': "-Zmiri-disable-isolation"}, ) + test("`cargo miri r` (subcrate, no ioslation)", + cargo_miri("r") + ["-p", "subcrate"], + "run.subcrate.stdout.ref", "run.subcrate.stderr.ref", + env={'MIRIFLAGS': "-Zmiri-disable-isolation"}, + ) test("`cargo miri run` (custom target dir)", # Attempt to confuse the argument parser. cargo_miri("run") + ["--target-dir=custom-run", "--", "--target-dir=target/custom-run"], @@ -146,6 +151,11 @@ def test_cargo_miri_test(): "test.subcrate.stdout.ref", "test.stderr-proc-macro.ref", env={'MIRIFLAGS': "-Zmiri-disable-isolation"}, ) + test("`cargo miri t` (subcrate, no isolation)", + cargo_miri("t") + ["-p", "subcrate"], + "test.subcrate.stdout.ref", "test.stderr-proc-macro.ref", + env={'MIRIFLAGS': "-Zmiri-disable-isolation"}, + ) test("`cargo miri test` (subcrate, doctests)", cargo_miri("test") + ["-p", "subcrate", "--doc"], "test.stdout-empty.ref", "test.stderr-proc-macro-doctest.ref",