Skip to content

Commit

Permalink
fix(test): Distinguish 'testname' from escaped arguments
Browse files Browse the repository at this point in the history
When working on clap v4, it appeared that `last` and `trailing_var_arg`
are mutually exclusive, so I called that out in the debug asserts in
clap-rs/clap#4187.  Unfortunately, I didn't document my research on this
as my focus was elsewhere.

When updating cargo to use clap v4 in rust-lang#11159, I found `last` and
`trailing_var_arg` were used together.  I figured this was what I was
trying to catch with above and I went off of my intuitive sense of these
commands and assumed `trailing_var_arg` was intended, not knowing about
the `testname` positional that is mostly just a forward to `libtest`,
there for documentation purposes, except for a small optimization.

So it looks like we just need the `last` call and not the
`trailing_var_arg` call.

This restores us to behavior from 531ce13 which is what I originally
wrote the tests against.
  • Loading branch information
epage committed Oct 7, 2022
1 parent dd6228e commit 3dd8413
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/bin/cargo/commands/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn cli() -> Command {
Arg::new("args")
.help("Arguments for the bench binary")
.num_args(0..)
.trailing_var_arg(true),
.last(true),
)
.arg_targets_all(
"Benchmark only this package's library",
Expand Down
2 changes: 1 addition & 1 deletion src/bin/cargo/commands/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn cli() -> Command {
Arg::new("args")
.help("Arguments for the test binary")
.num_args(0..)
.trailing_var_arg(true),
.last(true),
)
.arg(
flag(
Expand Down
3 changes: 3 additions & 0 deletions tests/testsuite/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,7 @@ fn pass_through_escaped() {
[COMPILING] foo v0.0.1 ([CWD])
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])
[DOCTEST] foo
",
)
.with_stdout_contains("running 1 test")
Expand All @@ -771,6 +772,7 @@ fn pass_through_escaped() {
"\
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])
[DOCTEST] foo
",
)
.with_stdout_contains("running 1 test")
Expand All @@ -782,6 +784,7 @@ fn pass_through_escaped() {
"\
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])
[DOCTEST] foo
",
)
.with_stdout_contains("running 2 tests")
Expand Down

0 comments on commit 3dd8413

Please sign in to comment.