Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop the [/] test output macro #5851

Merged
merged 2 commits into from
Aug 2, 2018
Merged

Drop the [/] test output macro #5851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05400b8
Drop the [/] test output macro
dwijnand Aug 2, 2018
5071b38
Push slash conforming to lines_match, so match_json uses it
dwijnand Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/testsuite/bad_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ fn bad_cargo_config_jobs() {
p.cargo("build").arg("-v"),
execs().with_status(101).with_stderr(
"\
[ERROR] error in [..].cargo[/]config: \
[ERROR] error in [..].cargo/config: \
could not load config key `build.jobs`: \
invalid value: integer `-1`, expected u32
",
Expand Down
88 changes: 44 additions & 44 deletions tests/testsuite/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fn cargo_bench_simple() {
"\
[COMPILING] foo v0.5.0 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
p.url()
))
.with_stdout_contains("test bench_hello ... bench: [..]"),
Expand Down Expand Up @@ -95,8 +95,8 @@ fn bench_bench_implicit() {
"\
[COMPILING] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target[/]release[/]deps[/]mybench-[..][EXE]
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/mybench-[..][EXE]
",
dir = p.url()
))
Expand Down Expand Up @@ -144,7 +144,7 @@ fn bench_bin_implicit() {
"\
[COMPILING] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target/release/deps/foo-[..][EXE]
",
dir = p.url()
))
Expand Down Expand Up @@ -183,7 +183,7 @@ fn bench_tarname() {
"\
[COMPILING] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]bin2-[..][EXE]
[RUNNING] target/release/deps/bin2-[..][EXE]
",
dir = p.url()
))
Expand Down Expand Up @@ -261,9 +261,9 @@ fn cargo_bench_verbose() {
.with_stderr(&format!(
"\
[COMPILING] foo v0.5.0 ({url})
[RUNNING] `rustc [..] src[/]main.rs [..]`
[RUNNING] `rustc [..] src/main.rs [..]`
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] hello --bench`",
[RUNNING] `[..]target/release/deps/foo-[..][EXE] hello --bench`",
url = p.url()
))
.with_stdout_contains("test bench_hello ... bench: [..]"),
Expand Down Expand Up @@ -372,15 +372,15 @@ fn cargo_bench_failing_test() {
"\
[COMPILING] foo v0.5.0 ({})[..]
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
p.url()
))
.with_either_contains(
"[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]",
)
.with_either_contains("[..]left: `\"hello\"`[..]")
.with_either_contains("[..]right: `\"nope\"`[..]")
.with_either_contains("[..]src[/]main.rs:15[..]")
.with_either_contains("[..]src/main.rs:15[..]")
.with_status(101),
);
}
Expand Down Expand Up @@ -447,8 +447,8 @@ fn bench_with_lib_dep() {
"\
[COMPILING] foo v0.0.1 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/baz-[..][EXE]",
p.url()
))
.with_stdout_contains("test lib_bench ... bench: [..]")
Expand Down Expand Up @@ -515,7 +515,7 @@ fn bench_with_deep_lib_dep() {
[COMPILING] foo v0.0.1 ([..])
[COMPILING] bar v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]",
[RUNNING] target/release/deps/bar-[..][EXE]",
dir = p.url()
))
.with_stdout_contains("test bar_bench ... bench: [..]"),
Expand Down Expand Up @@ -575,8 +575,8 @@ fn external_bench_explicit() {
"\
[COMPILING] foo v0.0.1 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target[/]release[/]deps[/]bench-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/bench-[..][EXE]",
p.url()
))
.with_stdout_contains("test internal_bench ... bench: [..]")
Expand Down Expand Up @@ -625,8 +625,8 @@ fn external_bench_implicit() {
"\
[COMPILING] foo v0.0.1 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target[/]release[/]deps[/]external-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/external-[..][EXE]",
p.url()
))
.with_stdout_contains("test internal_bench ... bench: [..]")
Expand Down Expand Up @@ -707,7 +707,7 @@ For more information on this warning you can consult
https://github.com/rust-lang/cargo/issues/5330
[COMPILING] foo v0.0.1 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target/release/deps/foo-[..][EXE]
",
p.url()
)),
Expand Down Expand Up @@ -758,7 +758,7 @@ fn pass_through_command_line() {
"\
[COMPILING] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
dir = p.url()
))
.with_stdout_contains("test bar ... bench: [..]"),
Expand All @@ -770,7 +770,7 @@ fn pass_through_command_line() {
.with_status(0)
.with_stderr(
"[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
)
.with_stdout_contains("test foo ... bench: [..]"),
);
Expand Down Expand Up @@ -859,8 +859,8 @@ fn lib_bin_same_name() {
"\
[COMPILING] foo v0.0.1 ({})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]
[RUNNING] target/release/deps/foo-[..][EXE]",
p.url()
))
.with_stdout_contains_n("test [..] ... bench: [..]", 2),
Expand Down Expand Up @@ -912,8 +912,8 @@ fn lib_with_standard_name() {
"\
[COMPILING] syntax v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]syntax-[..][EXE]
[RUNNING] target[/]release[/]deps[/]bench-[..][EXE]",
[RUNNING] target/release/deps/syntax-[..][EXE]
[RUNNING] target/release/deps/bench-[..][EXE]",
dir = p.url()
))
.with_stdout_contains("test foo_bench ... bench: [..]")
Expand Down Expand Up @@ -968,7 +968,7 @@ fn lib_with_standard_name2() {
"\
[COMPILING] syntax v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]syntax-[..][EXE]",
[RUNNING] target/release/deps/syntax-[..][EXE]",
dir = p.url()
))
.with_stdout_contains("test bench ... bench: [..]"),
Expand Down Expand Up @@ -1052,8 +1052,8 @@ fn bench_dylib() {
[RUNNING] [..] -C opt-level=3 [..]
[RUNNING] [..] -C opt-level=3 [..]
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`
[RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`",
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
dir = p.url()
))
.with_stdout_contains_n("test foo ... bench: [..]", 2),
Expand All @@ -1069,8 +1069,8 @@ fn bench_dylib() {
[FRESH] bar v0.0.1 ({dir}/bar)
[FRESH] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`
[RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`",
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
dir = p.url()
))
.with_stdout_contains_n("test foo ... bench: [..]", 2),
Expand Down Expand Up @@ -1115,7 +1115,7 @@ fn bench_twice_with_build_cmd() {
"\
[COMPILING] foo v0.0.1 ({dir})
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
dir = p.url()
))
.with_stdout_contains("test foo ... bench: [..]"),
Expand All @@ -1127,7 +1127,7 @@ fn bench_twice_with_build_cmd() {
.with_status(0)
.with_stderr(
"[FINISHED] release [optimized] target(s) in [..]
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]",
[RUNNING] target/release/deps/foo-[..][EXE]",
)
.with_stdout_contains("test foo ... bench: [..]"),
);
Expand Down Expand Up @@ -1215,8 +1215,8 @@ fn bench_with_examples() {
[RUNNING] `rustc [..]`
[RUNNING] `rustc [..]`
[FINISHED] release [optimized] target(s) in [..]
[RUNNING] `{dir}[/]target[/]release[/]deps[/]foo-[..][EXE] --bench`
[RUNNING] `{dir}[/]target[/]release[/]deps[/]testb1-[..][EXE] --bench`",
[RUNNING] `{dir}/target/release/deps/foo-[..][EXE] --bench`
[RUNNING] `{dir}/target/release/deps/testb1-[..][EXE] --bench`",
dir = p.root().display(),
url = p.url()
))
Expand Down Expand Up @@ -1262,7 +1262,7 @@ fn test_a_bench() {
"\
[COMPILING] foo v0.1.0 ([..])
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
[RUNNING] target[/]debug[/]deps[/]b-[..][EXE]",
[RUNNING] target/debug/deps/b-[..][EXE]",
)
.with_stdout_contains("test foo ... ok"),
);
Expand Down Expand Up @@ -1343,9 +1343,9 @@ fn test_bench_no_fail_fast() {
.arg("--test-threads=1"),
execs()
.with_status(101)
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
.with_stdout_contains("running 2 tests")
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
.with_stdout_contains("test bench_hello [..]")
.with_stdout_contains("test bench_nope [..]"),
);
Expand Down Expand Up @@ -1438,9 +1438,9 @@ fn test_bench_multiple_packages() {
p.cargo("bench").arg("-p").arg("bar").arg("-p").arg("baz"),
execs()
.with_status(0)
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bbaz-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/bbaz-[..][EXE]")
.with_stdout_contains("test bench_baz ... bench: [..]")
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bbar-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/bbar-[..][EXE]")
.with_stdout_contains("test bench_bar ... bench: [..]"),
);
}
Expand Down Expand Up @@ -1498,9 +1498,9 @@ fn bench_all_workspace() {
p.cargo("bench").arg("--all"),
execs()
.with_status(0)
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
.with_stdout_contains("test bench_bar ... bench: [..]")
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
.with_stdout_contains("test bench_foo ... bench: [..]"),
);
}
Expand Down Expand Up @@ -1601,9 +1601,9 @@ fn bench_all_virtual_manifest() {
p.cargo("bench").arg("--all"),
execs()
.with_status(0)
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
.with_stdout_contains("test bench_baz ... bench: [..]")
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
.with_stdout_contains("test bench_bar ... bench: [..]"),
);
}
Expand Down Expand Up @@ -1646,7 +1646,7 @@ fn legacy_bench_name() {
p.cargo("bench"),
execs().with_status(0).with_stderr_contains(
"\
[WARNING] path `[..]src[/]bench.rs` was erroneously implicitly accepted for benchmark `bench`,
[WARNING] path `[..]src/bench.rs` was erroneously implicitly accepted for benchmark `bench`,
please set bench.path in Cargo.toml",
),
);
Expand Down Expand Up @@ -1698,9 +1698,9 @@ fn bench_virtual_manifest_all_implied() {
p.cargo("bench"),
execs()
.with_status(0)
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]baz-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
.with_stdout_contains("test bench_baz ... bench: [..]")
.with_stderr_contains("[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
.with_stdout_contains("test bench_bar ... bench: [..]"),
);
}
Loading