fix test new command base cargo bin

Author: lamb

cmd/Cargo.toml

@@ -20,4 +20,4 @@ tokio = { version = "1.43.0", features = ["rt-multi-thread", "macros", "signal",
 [dev-dependencies]
 assert_fs = "1.1.2"
 tokio = { version = "1.43.0", features = ["process"] }
-axum = "0.8.1"
+axum = "0.8.1"

cmd/tests/command.rs

@@ -1,17 +1,17 @@
 use assert_fs::prelude::*;
 use axum::routing::get;
 use axum::Router;
+use std::path::PathBuf;
 use std::process::Stdio;
 use tokio::io::AsyncWriteExt;
 use tokio::process::Command;
 
 #[tokio::test]
 async fn test_command_repl() -> Result<(), Box<dyn std::error::Error>> {
-    let mut child = Command::new("basjoofan")
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .spawn()
-        .expect("Failed to spawn child process");
+    let mut command = new_command();
+    command.stdout(Stdio::piped());
+    command.stdin(Stdio::piped());
+    let mut child = command.spawn().expect("Failed to spawn child process");
     if let Some(mut stdin) = child.stdin.take() {
         stdin.write_all("let x = 1 + 1; println(\"{x}\", x);\n".as_bytes()).await?;
         stdin.write_all("exit".as_bytes()).await?;
@@ -24,16 +24,20 @@ async fn test_command_repl() -> Result<(), Box<dyn std::error::Error>> {
 
 #[tokio::test]
 async fn test_command_eval() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::new("basjoofan");
-    let output = cmd.arg("eval").arg(r#"print("{integer}", 1 + 1 )"#).output().await?;
+    let mut command = new_command();
+    let output = command.arg("eval").arg(r#"print("{integer}", 1 + 1 )"#).output().await?;
     assert!(output.status.success());
     assert_eq!(String::from_utf8(output.stdout)?, "2null\n");
-    let mut cmd = Command::new("basjoofan");
-    let output = cmd.arg("eval").arg(r#"let x = 1 + 1; print("{integer}", x);"#).output().await?;
+    let mut command = new_command();
+    let output = command.arg("eval").arg(r#"let x = 1 + 1; print("{integer}", x);"#).output().await?;
     assert!(output.status.success());
     assert_eq!(String::from_utf8(output.stdout)?, "2null\n");
-    let mut cmd = Command::new("basjoofan");
-    let output = cmd.arg("eval").arg(r#"println("{string}", "Hello Basjoofan!")"#).output().await?;
+    let mut command = new_command();
+    let output = command
+        .arg("eval")
+        .arg(r#"println("{string}", "Hello Basjoofan!")"#)
+        .output()
+        .await?;
     assert!(output.status.success());
     assert_eq!(String::from_utf8(output.stdout)?, "Hello Basjoofan!\nnull\n");
     Ok(())
@@ -62,7 +66,7 @@ async fn test_command_test() -> Result<(), Box<dyn std::error::Error>> {
     "#;
     file.write_str(text)?;
     // command test
-    let mut command = Command::new("basjoofan");
+    let mut command = new_command();
     command.current_dir(&temp);
     let output = command.arg("test").output().await?;
     assert!(output.status.success());
@@ -72,16 +76,47 @@ async fn test_command_test() -> Result<(), Box<dyn std::error::Error>> {
     println!("stderr:{}", stderr);
     assert!(stdout.contains("--- PASS  hello ("));
     // command test call
-    let mut command = Command::new("basjoofan");
+    let mut command = new_command();
     command.current_dir(&temp);
     let output = command.arg("test").arg("call").output().await?;
     assert!(output.status.success());
     assert!(String::from_utf8(output.stdout)?.contains("--- PASS  hello ("));
     // command test blank
-    let mut command = Command::new("basjoofan");
+    let mut command = new_command();
     command.current_dir(&temp);
     let output = command.arg("test").arg("blank").output().await?;
     assert!(output.status.success());
     assert_eq!(String::from_utf8(output.stdout)?, "Test not found: blank\n");
     Ok(())
 }
+
+fn new_command() -> Command {
+    Command::new(cargo_bin("basjoofan"))
+}
+
+/// Look up the path to a cargo-built binary within an integration test.
+fn cargo_bin<S: AsRef<str>>(name: S) -> PathBuf {
+    cargo_bin_str(name.as_ref())
+}
+
+fn cargo_bin_str(name: &str) -> PathBuf {
+    let env_var = format!("CARGO_BIN_EXE_{}", name);
+    std::env::var_os(env_var)
+        .map(|p| p.into())
+        .unwrap_or_else(|| target_dir().join(format!("{}{}", name, std::env::consts::EXE_SUFFIX)))
+}
+
+// Adapted from
+// https://github.com/rust-lang/cargo/blob/485670b3983b52289a2f353d589c57fae2f60f82/tests/testsuite/support/mod.rs#L507
+fn target_dir() -> PathBuf {
+    std::env::current_exe()
+        .ok()
+        .map(|mut path| {
+            path.pop();
+            if path.ends_with("deps") {
+                path.pop();
+            }
+            path
+        })
+        .expect("this should only be used where a `current_exe` can be set")
+}