add expect-test crate to update rust-gpu rev in tests with cargo xtask update-expect

Author: Firestar99

Cargo.lock

@@ -42,6 +42,7 @@ cargo_metadata = "0.21.0"
 cargo-util-schemas = "0.8.2"
 semver = "1.0.26"
 dunce = "1.0.5"
+expect-test = "1.5.1"
 
 
 

Cargo.toml

@@ -29,6 +29,7 @@ tempfile = { workspace = true, optional = true }
 test-log.workspace = true
 cargo_metadata = { workspace = true, features = ["builder"] }
 cargo-util-schemas = "0.8.2"
+expect-test = "1.5.1"
 
 [lints]
 workspace = true

crates/cargo-gpu-install/Cargo.toml

@@ -267,24 +267,18 @@ mod test {
     use crate::test::TestEnv;
     use cargo_metadata::{PackageBuilder, PackageId, Source};
     use cargo_util_schemas::manifest::PackageName;
+    use expect_test::expect;
 
     #[test_log::test]
     fn parsing_spirv_std_dep_for_shader_template() {
         let shader_template_path = crate::test::shader_crate_template_path();
         let source = SpirvSource::get_rust_gpu_deps_from_shader(&shader_template_path).unwrap();
-        assert_eq!(
-            source,
-            SpirvSource::Git {
-                url: "https://github.com/Rust-GPU/rust-gpu".to_owned(),
-                rev: "6a67e7b5954f37989ad540a555b5d6969073592e".to_owned()
-            }
-        );
-    }
-
-    #[test_log::test]
-    fn path_sanity() {
-        let path = std::path::PathBuf::from("./");
-        assert!(path.is_relative());
+        expect![[r#"
+            Git {
+                url: "https://github.com/Rust-GPU/rust-gpu",
+                rev: "6a67e7b5954f37989ad540a555b5d6969073592e",
+            }"#]]
+        .assert_eq(&format!("{source:#?}"));
     }
 
     #[test_log::test]
@@ -299,7 +293,13 @@ mod test {
             .to_str()
             .map(std::string::ToString::to_string)
             .unwrap();
-        assert_eq!("https___github_com_Rust-GPU_rust-gpu+6a67e7b5", &name);
+        expect!["https___github_com_Rust-GPU_rust-gpu+6a67e7b5"].assert_eq(&name);
+    }
+
+    #[test_log::test]
+    fn path_sanity() {
+        let path = std::path::PathBuf::from("./");
+        assert!(path.is_relative());
     }
 
     #[test_log::test]

crates/cargo-gpu-install/src/spirv_source.rs

@@ -6,6 +6,7 @@
     reason = "This is just a workflow tool"
 )]
 
+use std::ffi::OsStr;
 use anyhow::Context as _;
 use clap::Parser as _;
 
@@ -34,23 +35,17 @@ enum Cli {
         #[clap(long)]
         git: Option<String>,
     },
+    UpdateExpect,
 }
 
 /// run some cmd
-fn cmd(args: impl IntoIterator<Item = impl AsRef<str>>) -> anyhow::Result<()> {
+fn cmd(args: impl IntoIterator<Item = impl AsRef<OsStr>>) -> anyhow::Result<()> {
     let mut args = args.into_iter();
-    let mut cmd = std::process::Command::new(args.next().context("no args")?.as_ref());
-    for arg in args {
-        cmd.arg(arg.as_ref());
-    }
-
-    let output = cmd
-        .stdout(std::process::Stdio::inherit())
-        .stderr(std::process::Stdio::inherit())
-        .output()
+    let status = std::process::Command::new(args.next().context("no args")?.as_ref())
+        .args(args)
+        .status()
         .context("cmd failed")?;
-    anyhow::ensure!(output.status.success());
-
+    anyhow::ensure!(status.success());
     Ok(())
 }
 
@@ -307,6 +302,13 @@ fn main() -> anyhow::Result<()> {
                 &DependencyVersion::parse(version.clone(), git.clone())?,
             )?;
         }
+        Cli::UpdateExpect => {
+            let status = std::process::Command::new("cargo")
+                .args(["nextest", "run"])
+                .env("UPDATE_EXPECT", "1")
+                .status()?;
+            anyhow::ensure!(status.success());
+        }
     }
     Ok(())
 }