Remove tester subcommand again

This functionality is better implemented manually on top of `bootimage run`. Such a manual implementation can be a proper workspace member and correctly share the sysroot and the target artifacts (with the `bootimage tester` we don't achieve sharing because the dependency fingerprints differ).

Author: phil-opp

azure-pipelines.yml

@@ -198,7 +198,3 @@ jobs:
       if [ $? -eq 109 ]; then (exit 0); else (exit 1); fi
     workingDirectory: example-kernels/runner
     displayName: 'Run `cargo xrun` for "runner" kernel'
-
-  - script: cargo test
-    workingDirectory: example-kernels/tester
-    displayName: 'Run `cargo test` for "tester" kernel'

src/args.rs

@@ -30,7 +30,6 @@ pub(crate) fn parse_args() -> Result<Command, ErrorString> {
             cmd => cmd,
         }),
         Some("runner") => parse_runner_args(args),
-        Some("tester") => parse_tester_args(args),
         Some("--help") | Some("-h") => Ok(Command::Help),
         Some("--version") => Ok(Command::Version),
         _ => Ok(Command::NoSubcommand),
@@ -244,63 +243,3 @@ pub struct RunnerArgs {
     pub executable: PathBuf,
 }
 
-fn parse_tester_args<A>(args: A) -> Result<Command, ErrorString>
-where
-    A: Iterator<Item = String>,
-{
-    let mut arg_iter = args.into_iter().fuse();
-    let test_path_arg = PathBuf::from(
-        arg_iter
-            .next()
-            .ok_or("excepted path to test source file as first argument")?,
-    );
-    let test_path = test_path_arg.canonicalize().map_err(|err| {
-        format!(
-            "Failed to canonicalize test path `{}`: {}",
-            test_path_arg.display(),
-            err
-        )
-    })?;
-    let mut run_command = None;
-    let mut target = None;
-
-    loop {
-        match arg_iter.next().as_ref().map(|s| s.as_str()) {
-            Some("--command") => {
-                let old = mem::replace(&mut run_command, Some(arg_iter.collect()));
-                if !old.is_none() {
-                    Err("multiple `--command` arguments")?;
-                }
-                break;
-            }
-            Some("--target") => {
-                let old = mem::replace(&mut target, arg_iter.next());
-                if !old.is_none() {
-                    Err("multiple `--target` arguments")?;
-                }
-                break;
-            }
-            Some("--help") | Some("-h") => {
-                return Ok(Command::TesterHelp);
-            }
-            Some("--version") => {
-                return Ok(Command::Version);
-            }
-            None => break,
-            Some(arg) => Err(format!("unexpected argument `{}`", arg))?,
-        }
-    }
-
-    Ok(Command::Tester(TesterArgs {
-        test_path,
-        run_command,
-        target,
-    }))
-}
-
-#[derive(Debug, Clone)]
-pub struct TesterArgs {
-    pub test_path: PathBuf,
-    pub run_command: Option<Vec<String>>,
-    pub target: Option<String>,
-}

src/lib.rs

@@ -1,4 +1,4 @@
-use args::{Args, RunnerArgs, TesterArgs};
+use args::{Args, RunnerArgs};
 use std::{fmt, process};
 
 pub mod args;
@@ -14,14 +14,12 @@ enum Command {
     Run(Args),
     Test(Args),
     Runner(RunnerArgs),
-    Tester(TesterArgs),
     Help,
     BuildHelp,
     RunHelp,
     TestHelp,
     CargoBootimageHelp,
     RunnerHelp,
-    TesterHelp,
     Version,
 }
 
@@ -46,14 +44,13 @@ pub fn run() -> Result<Option<i32>, ErrorString> {
         Command::Run(args) => subcommand::run::run(args).map(Some),
         Command::Test(args) => subcommand::test::test(args).map(none),
         Command::Runner(args) => subcommand::runner::runner(args).map(Some),
-        Command::Tester(args) => subcommand::tester::tester(args).map(none),
         Command::NoSubcommand => help::no_subcommand(),
         Command::Help => Ok(help::help()).map(none),
         Command::BuildHelp => Ok(help::build_help()).map(none),
         Command::RunHelp => Ok(help::run_help()).map(none),
         Command::TestHelp => Ok(help::test_help()).map(none),
         Command::Version => Ok(println!("bootimage {}", env!("CARGO_PKG_VERSION"))).map(none),
-        Command::RunnerHelp | Command::TesterHelp | Command::CargoBootimageHelp => unimplemented!(),
+        Command::RunnerHelp | Command::CargoBootimageHelp => unimplemented!(),
     }
 }
 

src/subcommand.rs

@@ -2,4 +2,3 @@ pub mod build;
 pub mod run;
 pub mod runner;
 pub mod test;
-pub mod tester;