From a6bcc9cf9c311454463953e4db5dcab0a56e8c39 Mon Sep 17 00:00:00 2001
From: Samuel Moelius <sam@moeli.us>
Date: Mon, 3 Feb 2025 11:26:31 -0500
Subject: [PATCH] Have mocked cargo better adhere to cargo conventions

Currently, when the mocked cargo command is passed
`--recursive-cargo-subcommand`, it runs:

```
cargo-foo --recursive-cargo
```

However, cargo subcommands are normally passed their subcommand name as
the first argument. Thus, one would expect the following to be run:

```
cargo-foo foo --recursive-cargo
```

This commit changes the mocked cargo command to do the latter. It also
adds a check to ensure that the "subcommand name as first argument"
behavior is respected.

This is, admittedly, a rather pedantic change.

Extracted from #4175
---
 src/test/mock/mock_bin_src.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/mock/mock_bin_src.rs b/src/test/mock/mock_bin_src.rs
index 4d4ba25432..5e27d1666e 100644
--- a/src/test/mock/mock_bin_src.rs
+++ b/src/test/mock/mock_bin_src.rs
@@ -5,7 +5,16 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 fn main() {
-    let mut args = env::args_os().skip(1);
+    let mut args = env::args_os();
+    let arg0 = args.next().unwrap();
+    if let Some(cargo_subcommand) = PathBuf::from(arg0)
+        .file_stem()
+        .and_then(|s| s.to_str())
+        .and_then(|s| s.strip_prefix("cargo-"))
+    {
+        let arg1 = args.next().unwrap();
+        assert_eq!(arg1, cargo_subcommand);
+    }
     match args.next().as_ref().and_then(|s| s.to_str()) {
         Some("--version") => {
             let me = env::current_exe().unwrap();
@@ -63,7 +72,7 @@ fn main() {
         }
         Some("--recursive-cargo-subcommand") => {
             let status = Command::new("cargo-foo")
-                .arg("--recursive-cargo")
+                .args(["foo", "--recursive-cargo"])
                 .status()
                 .unwrap();
             assert!(status.success());