From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 30 May 2024 20:31:44 +0200
Subject: Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../cargo/tests/testsuite/cargo_bench/help/stdout.log |  2 +-
 src/tools/cargo/tests/testsuite/cargo_bench/mod.rs    |  1 +
 .../testsuite/cargo_bench/no_keep_going/in/Cargo.toml |  3 +++
 .../testsuite/cargo_bench/no_keep_going/in/src/lib.rs |  0
 .../tests/testsuite/cargo_bench/no_keep_going/mod.rs  | 19 +++++++++++++++++++
 .../testsuite/cargo_bench/no_keep_going/stderr.log    |  7 +++++++
 .../testsuite/cargo_bench/no_keep_going/stdout.log    |  0
 7 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/Cargo.toml
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/src/lib.rs
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/mod.rs
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stderr.log
 create mode 100644 src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stdout.log

(limited to 'src/tools/cargo/tests/testsuite/cargo_bench')

diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/help/stdout.log b/src/tools/cargo/tests/testsuite/cargo_bench/help/stdout.log
index 5d9484df9..430d8be42 100644
--- a/src/tools/cargo/tests/testsuite/cargo_bench/help/stdout.log
+++ b/src/tools/cargo/tests/testsuite/cargo_bench/help/stdout.log
@@ -45,7 +45,7 @@ Feature Selection:
 Compilation Options:
   -j, --jobs <N>                Number of parallel jobs, defaults to # of CPUs.
       --profile <PROFILE-NAME>  Build artifacts with the specified profile
-      --target <TRIPLE>         Build for the target triple
+      --target [<TRIPLE>]       Build for the target triple
       --target-dir <DIRECTORY>  Directory for all generated artifacts
       --unit-graph              Output build graph in JSON (unstable)
       --timings[=<FMTS>]        Timing output formats (unstable) (comma separated): html, json
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/mod.rs b/src/tools/cargo/tests/testsuite/cargo_bench/mod.rs
index c0ce11180..28be9d1a7 100644
--- a/src/tools/cargo/tests/testsuite/cargo_bench/mod.rs
+++ b/src/tools/cargo/tests/testsuite/cargo_bench/mod.rs
@@ -1 +1,2 @@
 mod help;
+mod no_keep_going;
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/Cargo.toml b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/Cargo.toml
new file mode 100644
index 000000000..c35d63273
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/Cargo.toml
@@ -0,0 +1,3 @@
+[package]
+name = "foo"
+version = "0.1.0"
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/src/lib.rs b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/in/src/lib.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/mod.rs
new file mode 100644
index 000000000..6ed5f81f9
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/mod.rs
@@ -0,0 +1,19 @@
+use cargo_test_support::curr_dir;
+use cargo_test_support::CargoCommand;
+use cargo_test_support::Project;
+
+#[cargo_test]
+fn case() {
+    let project = Project::from_template(curr_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("bench")
+        .arg("--keep-going")
+        .current_dir(cwd)
+        .assert()
+        .code(1)
+        .stdout_matches_path(curr_dir!().join("stdout.log"))
+        .stderr_matches_path(curr_dir!().join("stderr.log"));
+}
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stderr.log b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stderr.log
new file mode 100644
index 000000000..7b94abbc4
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stderr.log
@@ -0,0 +1,7 @@
+error: unexpected argument '--keep-going' found
+
+  tip: use `--no-fail-fast` to run as many tests as possible regardless of failure
+
+Usage: cargo[EXE] bench [OPTIONS] [BENCHNAME] [-- [args]...]
+
+For more information, try '--help'.
diff --git a/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stdout.log b/src/tools/cargo/tests/testsuite/cargo_bench/no_keep_going/stdout.log
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3