Skip to content

Commit 0682ced

Browse files
borsbors
authored
Auto merge of #3257 - nipunn1313:slash, r=alexcrichton
Add a [/] macro expansion for tests Converts to backslash on windows. Currently, we're using [..], so this will tighten up the tests.
2 parents 8709867 + 2435936 commit 0682ced

File tree

17 files changed

+270
-281
lines changed

17 files changed

+270
-281
lines changed

‎tests/bench.rs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn cargo_bench_simple() {
4343
execs().with_stderr(&format!("\
4444
[COMPILING] foo v0.5.0 ({})
4545
[FINISHED] release [optimized] target(s) in [..]
46-
[RUNNING] target[..]release[..]foo-[..][EXE]", p.url()))
46+
[RUNNING] target[/]release[/]foo-[..][EXE]", p.url()))
4747
.with_stdout("
4848
running 1 test
4949
test bench_hello ... bench: [..] 0 ns/iter (+/- 0)
@@ -78,7 +78,7 @@ fn bench_tarname() {
7878
.with_stderr(format!("\
7979
[COMPILING] foo v0.0.1 ({dir})
8080
[FINISHED] release [optimized] target(s) in [..]
81-
[RUNNING] target[..]release[..]bin2-[..][EXE]
81+
[RUNNING] target[/]release[/]bin2-[..][EXE]
8282
", dir = prj.url()))
8383
.with_stdout("
8484
running 1 test
@@ -105,9 +105,9 @@ fn cargo_bench_verbose() {
105105
assert_that(p.cargo_process("bench").arg("-v").arg("hello"),
106106
execs().with_stderr(&format!("\
107107
[COMPILING] foo v0.5.0 ({url})
108-
[RUNNING] `rustc src[..]foo.rs [..]`
108+
[RUNNING] `rustc src[/]foo.rs [..]`
109109
[FINISHED] release [optimized] target(s) in [..]
110-
[RUNNING] `[..]target[..]release[..]foo-[..][EXE] hello --bench`", url = p.url()))
110+
[RUNNING] `[..]target[/]release[/]foo-[..][EXE] hello --bench`", url = p.url()))
111111
.with_stdout("
112112
running 1 test
113113
test bench_hello ... bench: [..] 0 ns/iter (+/- 0)
@@ -190,10 +190,10 @@ test bench_hello ... ")
190190
.with_stderr_contains(format!("\
191191
[COMPILING] foo v0.5.0 ({})
192192
[FINISHED] release [optimized] target(s) in [..]
193-
[RUNNING] target[..]release[..]foo-[..][EXE]
193+
[RUNNING] target[/]release[/]foo-[..][EXE]
194194
thread '[..]' panicked at 'assertion failed: \
195195
`(left == right)` (left: \
196-
`\"hello\"`, right: `\"nope\"`)', src[..]foo.rs:14
196+
`\"hello\"`, right: `\"nope\"`)', src[/]foo.rs:14
197197
[..]
198198
", p.url()))
199199
.with_status(101));
@@ -243,8 +243,8 @@ fn bench_with_lib_dep() {
243243
execs().with_stderr(&format!("\
244244
[COMPILING] foo v0.0.1 ({})
245245
[FINISHED] release [optimized] target(s) in [..]
246-
[RUNNING] target[..]release[..]baz-[..][EXE]
247-
[RUNNING] target[..]release[..]foo-[..][EXE]", p.url()))
246+
[RUNNING] target[/]release[/]baz-[..][EXE]
247+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", p.url()))
248248
.with_stdout("
249249
running 1 test
250250
test bin_bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -307,7 +307,7 @@ fn bench_with_deep_lib_dep() {
307307
[COMPILING] foo v0.0.1 ([..])
308308
[COMPILING] bar v0.0.1 ({dir})
309309
[FINISHED] release [optimized] target(s) in [..]
310-
[RUNNING] target[..]release[..]deps[..]bar-[..][EXE]", dir = p.url()))
310+
[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]", dir = p.url()))
311311
.with_stdout("
312312
running 1 test
313313
test bar_bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -353,8 +353,8 @@ fn external_bench_explicit() {
353353
execs().with_stderr(&format!("\
354354
[COMPILING] foo v0.0.1 ({})
355355
[FINISHED] release [optimized] target(s) in [..]
356-
[RUNNING] target[..]release[..]bench-[..][EXE]
357-
[RUNNING] target[..]release[..]foo-[..][EXE]", p.url()))
356+
[RUNNING] target[/]release[/]bench-[..][EXE]
357+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", p.url()))
358358
.with_stdout("
359359
running 1 test
360360
test external_bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -403,8 +403,8 @@ fn external_bench_implicit() {
403403
execs().with_stderr(&format!("\
404404
[COMPILING] foo v0.0.1 ({})
405405
[FINISHED] release [optimized] target(s) in [..]
406-
[RUNNING] target[..]release[..]external-[..][EXE]
407-
[RUNNING] target[..]release[..]foo-[..][EXE]", p.url()))
406+
[RUNNING] target[/]release[/]external-[..][EXE]
407+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", p.url()))
408408
.with_stdout("
409409
running 1 test
410410
test external_bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -464,7 +464,7 @@ fn pass_through_command_line() {
464464
.with_stderr(&format!("\
465465
[COMPILING] foo v0.0.1 ({dir})
466466
[FINISHED] release [optimized] target(s) in [..]
467-
[RUNNING] target[..]release[..]foo-[..][EXE]", dir = p.url()))
467+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", dir = p.url()))
468468
.with_stdout("
469469
running 1 test
470470
test bar ... bench: [..] 0 ns/iter (+/- 0)
@@ -476,7 +476,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
476476
assert_that(p.cargo("bench").arg("foo"),
477477
execs().with_status(0)
478478
.with_stderr("[FINISHED] release [optimized] target(s) in [..]
479-
[RUNNING] target[..]release[..]foo-[..][EXE]")
479+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
480480
.with_stdout("
481481
running 1 test
482482
test foo ... bench: [..] 0 ns/iter (+/- 0)
@@ -546,8 +546,8 @@ fn lib_bin_same_name() {
546546
execs().with_stderr(&format!("\
547547
[COMPILING] foo v0.0.1 ({})
548548
[FINISHED] release [optimized] target(s) in [..]
549-
[RUNNING] target[..]release[..]foo-[..][EXE]
550-
[RUNNING] target[..]release[..]foo-[..][EXE]", p.url()))
549+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
550+
[RUNNING] target[/]release[/]foo-[..][EXE]", p.url()))
551551
.with_stdout("
552552
running 1 test
553553
test [..] ... bench: [..] 0 ns/iter (+/- 0)
@@ -600,8 +600,8 @@ fn lib_with_standard_name() {
600600
.with_stderr(&format!("\
601601
[COMPILING] syntax v0.0.1 ({dir})
602602
[FINISHED] release [optimized] target(s) in [..]
603-
[RUNNING] target[..]release[..]bench-[..][EXE]
604-
[RUNNING] target[..]release[..]syntax-[..][EXE]", dir = p.url()))
603+
[RUNNING] target[/]release[/]bench-[..][EXE]
604+
[RUNNING] target[/]release[/]deps[/]syntax-[..][EXE]", dir = p.url()))
605605
.with_stdout("
606606
running 1 test
607607
test bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -652,7 +652,7 @@ fn lib_with_standard_name2() {
652652
.with_stderr(&format!("\
653653
[COMPILING] syntax v0.0.1 ({dir})
654654
[FINISHED] release [optimized] target(s) in [..]
655-
[RUNNING] target[..]release[..]syntax-[..][EXE]", dir = p.url()))
655+
[RUNNING] target[/]release[/]syntax-[..][EXE]", dir = p.url()))
656656
.with_stdout("
657657
running 1 test
658658
test bench ... bench: [..] 0 ns/iter (+/- 0)
@@ -722,8 +722,8 @@ fn bench_dylib() {
722722
[RUNNING] [..] -C opt-level=3 [..]
723723
[RUNNING] [..] -C opt-level=3 [..]
724724
[FINISHED] release [optimized] target(s) in [..]
725-
[RUNNING] `[..]target[..]release[..]bench-[..][EXE] --bench`
726-
[RUNNING] `[..]target[..]release[..]foo-[..][EXE] --bench`", dir = p.url()))
725+
[RUNNING] `[..]target[/]release[/]bench-[..][EXE] --bench`
726+
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`", dir = p.url()))
727727
.with_stdout("
728728
running 1 test
729729
test foo ... bench: [..] 0 ns/iter (+/- 0)
@@ -744,8 +744,8 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
744744
[FRESH] bar v0.0.1 ({dir}/bar)
745745
[FRESH] foo v0.0.1 ({dir})
746746
[FINISHED] release [optimized] target(s) in [..]
747-
[RUNNING] `[..]target[..]release[..]bench-[..][EXE] --bench`
748-
[RUNNING] `[..]target[..]release[..]foo-[..][EXE] --bench`", dir = p.url()))
747+
[RUNNING] `[..]target[/]release[/]bench-[..][EXE] --bench`
748+
[RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`", dir = p.url()))
749749
.with_stdout("
750750
running 1 test
751751
test foo ... bench: [..] 0 ns/iter (+/- 0)
@@ -786,7 +786,7 @@ fn bench_twice_with_build_cmd() {
786786
.with_stderr(&format!("\
787787
[COMPILING] foo v0.0.1 ({dir})
788788
[FINISHED] release [optimized] target(s) in [..]
789-
[RUNNING] target[..]release[..]foo-[..][EXE]", dir = p.url()))
789+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]", dir = p.url()))
790790
.with_stdout("
791791
running 1 test
792792
test foo ... bench: [..] 0 ns/iter (+/- 0)
@@ -798,7 +798,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
798798
assert_that(p.cargo("bench"),
799799
execs().with_status(0)
800800
.with_stderr("[FINISHED] release [optimized] target(s) in [..]
801-
[RUNNING] target[..]release[..]foo-[..][EXE]")
801+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
802802
.with_stdout("
803803
running 1 test
804804
test foo ... bench: [..] 0 ns/iter (+/- 0)
@@ -871,8 +871,8 @@ fn bench_with_examples() {
871871
[RUNNING] `rustc [..]`
872872
[RUNNING] `rustc [..]`
873873
[FINISHED] release [optimized] target(s) in [..]
874-
[RUNNING] `{dir}[..]target[..]release[..]testb1-[..][EXE] --bench`
875-
[RUNNING] `{dir}[..]target[..]release[..]testbench-[..][EXE] --bench`",
874+
[RUNNING] `{dir}[/]target[/]release[/]testb1-[..][EXE] --bench`
875+
[RUNNING] `{dir}[/]target[/]release[/]deps[/]testbench-[..][EXE] --bench`",
876876
dir = p.root().display(), url = p.url()))
877877
.with_stdout("
878878
running 1 test
@@ -920,7 +920,7 @@ fn test_a_bench() {
920920
.with_stderr("\
921921
[COMPILING] foo v0.1.0 ([..])
922922
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
923-
[RUNNING] target[..]debug[..]b-[..][EXE]")
923+
[RUNNING] target[/]debug[/]b-[..][EXE]")
924924
.with_stdout("
925925
running 1 test
926926
test foo ... ok
@@ -1030,15 +1030,15 @@ fn test_bench_multiple_packages() {
10301030
assert_that(p.cargo_process("bench").arg("-p").arg("bar").arg("-p").arg("baz"),
10311031
execs().with_status(0)
10321032
.with_stderr_contains("\
1033-
[RUNNING] target[..]release[..]bbaz-[..][EXE]")
1033+
[RUNNING] target[/]release[/]deps[/]bbaz-[..][EXE]")
10341034
.with_stdout_contains("
10351035
running 1 test
10361036
test bench_baz ... bench: 0 ns/iter (+/- 0)
10371037
10381038
test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured
10391039
")
10401040
.with_stderr_contains("\
1041-
[RUNNING] target[..]release[..]bbar-[..][EXE]")
1041+
[RUNNING] target[/]release[/]deps[/]bbar-[..][EXE]")
10421042
.with_stdout_contains("
10431043
running 1 test
10441044
test bench_bar ... bench: 0 ns/iter (+/- 0)

‎tests/build-lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
extern crate cargotest;
22
extern crate hamcrest;
33

4-
use std::path::MAIN_SEPARATOR as SEP;
5-
64
use cargotest::support::{basic_bin_manifest, execs, project, ProjectBuilder};
75
use hamcrest::{assert_that};
86

97
fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
108
format!("\
119
[COMPILING] {name} v{version} ({url})
12-
[RUNNING] `rustc src{sep}lib.rs --crate-name {name} --crate-type lib -g \
10+
[RUNNING] `rustc src[/]lib.rs --crate-name {name} --crate-type lib -g \
1311
-C metadata=[..] \
1412
--out-dir [..] \
1513
--emit=dep-info,link \
16-
-L dependency={dir}{sep}target{sep}debug{sep}deps`
14+
-L dependency={dir}[/]target[/]debug[/]deps`
1715
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
18-
", sep = SEP,
16+
",
1917
dir = p.root().display(), url = p.url(),
2018
name = "foo", version = "0.0.1")
2119
}

0 commit comments

Comments
 (0)