Dummy commit.

Author: Alexhuszagh

tests/cli.rs

@@ -1,7 +1,50 @@
+use std::process::{Command, ExitStatus, Output};
 
 #[test]
-fn cli_tests() {
+fn cli_tests() -> cross::Result<()> {
+    let cargo_version = run_success("cargo", &["--version"])?;
+    let cargo_help = run_success("cargo", &["--help"])?;
+    // TODO(ahuszagh) Should get some output here
+    // TODO(ahuszagh) Get version info from Rust
+    // TODO(ahuszagh) Get version info from cargo
+
     trycmd::TestCases::new()
-        .case("tests/cmd/*.trycmd")
-        .case("tests/cmd/*.toml");
+        .case("tests/cmd/*.toml")
+        .fail("tests/cmd/no-color.toml")
+        .insert_var("[CARGOVERSION]", cargo_version.stdout)?
+        .insert_var("[CARGOHELP]", cargo_help.stdout)?;
+
+    Ok(())
+}
+
+fn run(bin: &str, args: &[&str]) -> cross::Result<Utf8Output> {
+    Utf8Output::new(Command::new(bin).args(args).output()?)
+}
+
+fn run_success(bin: &str, args: &[&str]) -> cross::Result<Utf8Output> {
+    run_with_status(bin, args, Some(0))
+}
+
+fn run_with_status(bin: &str, args: &[&str], status: Option<i32>) -> cross::Result<Utf8Output> {
+    let output = run(bin, args)?;
+    if output.status.code() != status {
+        eyre::bail!("Unexpected exit status of {:?}", output.status);
+    }
+    Ok(output)
+}
+
+struct Utf8Output {
+    status: ExitStatus,
+    stdout: String,
+    stderr: String,
+}
+
+impl Utf8Output {
+    fn new(output: Output) -> cross::Result<Self> {
+        Ok(Self {
+            status: output.status,
+            stdout: String::from_utf8(output.stdout)?,
+            stderr: String::from_utf8(output.stderr)?,
+        })
+    }
 }

tests/cmd/fallback.stderr

@@ -0,0 +1 @@
+[cross] note: Falling back to `cargo` on the host.

tests/cmd/help.stderr

@@ -0,0 +1 @@
+fallback.stderr

tests/cmd/help.stdout

@@ -0,0 +1 @@
+[CARGOHELP]

tests/cmd/help.toml

@@ -0,0 +1,2 @@
+bin.name = "cross"
+args = ["--help"]

tests/cmd/help.trycmd

@@ -1,11 +1,6 @@
-**No Color Provided:**
-
-```
-$ cross --color
 [cross] error: The argument '--color <WHEN>' requires a value but none was supplied
                [possible values: auto, always, never]
 Usage:
     cross [+toolchain] [OPTIONS] [SUBCOMMAND]
 
 For more information try --help
-```

tests/cmd/terminal.trycmd renamed to tests/cmd/no-color.stderr

@@ -0,0 +1,2 @@
+bin.name = "cross"
+args = ["--color"]

tests/cmd/no-color.toml

@@ -0,0 +1 @@
+fallback.stderr

tests/cmd/short-help.stderr

@@ -0,0 +1 @@
+help.stdout