Skip to content

Commit 9ab347d

Browse files
borsbors
committed
Auto merge of #5950 - dwijnand:cwd, r=alexcrichton
Introduce the CWD macro in test output asserting Avoids dealing with things like CWD changing. Mentioned in #5742
2 parents 1f49100 + d5fc8dc commit 9ab347d

35 files changed

+583
-862
lines changed

‎tests/testsuite/alt_registry.rs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ fn depend_on_alt_registry() {
5959
[UPDATING] registry `{reg}`
6060
[DOWNLOADING] bar v0.0.1 (registry `file://[..]`)
6161
[COMPILING] bar v0.0.1 (registry `file://[..]`)
62-
[COMPILING] foo v0.0.1 ({dir})
62+
[COMPILING] foo v0.0.1 (CWD)
6363
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
6464
",
65-
dir = p.url(),
6665
reg = registry::alt_registry()
6766
)).run();
6867

@@ -71,14 +70,13 @@ fn depend_on_alt_registry() {
7170
// Don't download a second time
7271
p.cargo("build")
7372
.masquerade_as_nightly_cargo()
74-
.with_stderr(&format!(
73+
.with_stderr(
7574
"\
7675
[COMPILING] bar v0.0.1 (registry `file://[..]`)
77-
[COMPILING] foo v0.0.1 ({dir})
76+
[COMPILING] foo v0.0.1 (CWD)
7877
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
7978
",
80-
dir = p.url()
81-
)).run();
79+
).run();
8280
}
8381

8482
#[test]
@@ -116,10 +114,9 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() {
116114
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
117115
[COMPILING] baz v0.0.1 (registry `file://[..]`)
118116
[COMPILING] bar v0.0.1 (registry `file://[..]`)
119-
[COMPILING] foo v0.0.1 ({dir})
117+
[COMPILING] foo v0.0.1 (CWD)
120118
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
121119
",
122-
dir = p.url(),
123120
reg = registry::alt_registry()
124121
)).run();
125122
}
@@ -159,10 +156,9 @@ fn depend_on_alt_registry_depends_on_same_registry() {
159156
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
160157
[COMPILING] baz v0.0.1 (registry `file://[..]`)
161158
[COMPILING] bar v0.0.1 (registry `file://[..]`)
162-
[COMPILING] foo v0.0.1 ({dir})
159+
[COMPILING] foo v0.0.1 (CWD)
163160
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
164161
",
165-
dir = p.url(),
166162
reg = registry::alt_registry()
167163
)).run();
168164
}
@@ -203,10 +199,9 @@ fn depend_on_alt_registry_depends_on_crates_io() {
203199
[DOWNLOADING] [..] v0.0.1 (registry `file://[..]`)
204200
[COMPILING] baz v0.0.1 (registry `file://[..]`)
205201
[COMPILING] bar v0.0.1 (registry `file://[..]`)
206-
[COMPILING] foo v0.0.1 ({dir})
202+
[COMPILING] foo v0.0.1 (CWD)
207203
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
208204
",
209-
dir = p.url(),
210205
alt_reg = registry::alt_registry(),
211206
reg = registry::registry()
212207
)).run();
@@ -238,14 +233,13 @@ fn registry_and_path_dep_works() {
238233

239234
p.cargo("build")
240235
.masquerade_as_nightly_cargo()
241-
.with_stderr(&format!(
236+
.with_stderr(
242237
"\
243-
[COMPILING] bar v0.0.1 ({dir}/bar)
244-
[COMPILING] foo v0.0.1 ({dir})
238+
[COMPILING] bar v0.0.1 (CWD/bar)
239+
[COMPILING] foo v0.0.1 (CWD)
245240
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
246241
",
247-
dir = p.url()
248-
)).run();
242+
).run();
249243
}
250244

251245
#[test]
@@ -371,7 +365,7 @@ fn alt_registry_and_crates_io_deps() {
371365
.with_stderr_contains("[DOWNLOADING] alt_reg_dep v0.1.0 (registry `file://[..]`)")
372366
.with_stderr_contains("[COMPILING] alt_reg_dep v0.1.0 (registry `file://[..]`)")
373367
.with_stderr_contains("[COMPILING] crates_io_dep v0.0.1")
374-
.with_stderr_contains(&format!("[COMPILING] foo v0.0.1 ({})", p.url()))
368+
.with_stderr_contains("[COMPILING] foo v0.0.1 (CWD)")
375369
.with_stderr_contains("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s")
376370
.run();
377371
}

‎tests/testsuite/bad_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ fn unused_keys() {
641641
.with_stderr(
642642
"\
643643
warning: unused manifest key: target.foo.bar
644-
[COMPILING] foo v0.1.0 (file:///[..])
644+
[COMPILING] foo v0.1.0 (CWD)
645645
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
646646
",
647647
).run();

‎tests/testsuite/bench.rs

Lines changed: 23 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ fn cargo_bench_simple() {
3939
p.cargo("bench")
4040
.with_stderr(&format!(
4141
"\
42-
[COMPILING] foo v0.5.0 ({})
42+
[COMPILING] foo v0.5.0 (CWD)
4343
[FINISHED] release [optimized] target(s) in [..]
4444
[RUNNING] target/release/deps/foo-[..][EXE]",
45-
p.url()
4645
)).with_stdout_contains("test bench_hello ... bench: [..]")
4746
.run();
4847
}
@@ -79,12 +78,11 @@ fn bench_bench_implicit() {
7978
p.cargo("bench --benches")
8079
.with_stderr(format!(
8180
"\
82-
[COMPILING] foo v0.0.1 ({dir})
81+
[COMPILING] foo v0.0.1 (CWD)
8382
[FINISHED] release [optimized] target(s) in [..]
8483
[RUNNING] target/release/deps/foo-[..][EXE]
8584
[RUNNING] target/release/deps/mybench-[..][EXE]
8685
",
87-
dir = p.url()
8886
)).with_stdout_contains("test run2 ... bench: [..]")
8987
.run();
9088
}
@@ -121,11 +119,10 @@ fn bench_bin_implicit() {
121119
p.cargo("bench --bins")
122120
.with_stderr(format!(
123121
"\
124-
[COMPILING] foo v0.0.1 ({dir})
122+
[COMPILING] foo v0.0.1 (CWD)
125123
[FINISHED] release [optimized] target(s) in [..]
126124
[RUNNING] target/release/deps/foo-[..][EXE]
127125
",
128-
dir = p.url()
129126
)).with_stdout_contains("test run1 ... bench: [..]")
130127
.run();
131128
}
@@ -154,11 +151,10 @@ fn bench_tarname() {
154151
p.cargo("bench --bench bin2")
155152
.with_stderr(format!(
156153
"\
157-
[COMPILING] foo v0.0.1 ({dir})
154+
[COMPILING] foo v0.0.1 (CWD)
158155
[FINISHED] release [optimized] target(s) in [..]
159156
[RUNNING] target/release/deps/bin2-[..][EXE]
160157
",
161-
dir = p.url()
162158
)).with_stdout_contains("test run2 ... bench: [..]")
163159
.run();
164160
}
@@ -219,11 +215,10 @@ fn cargo_bench_verbose() {
219215
p.cargo("bench -v hello")
220216
.with_stderr(&format!(
221217
"\
222-
[COMPILING] foo v0.5.0 ({url})
218+
[COMPILING] foo v0.5.0 (CWD)
223219
[RUNNING] `rustc [..] src/main.rs [..]`
224220
[FINISHED] release [optimized] target(s) in [..]
225221
[RUNNING] `[..]target/release/deps/foo-[..][EXE] hello --bench`",
226-
url = p.url()
227222
)).with_stdout_contains("test bench_hello ... bench: [..]")
228223
.run();
229224
}
@@ -310,10 +305,9 @@ fn cargo_bench_failing_test() {
310305
.with_stdout_contains("test bench_hello ...[..]")
311306
.with_stderr_contains(format!(
312307
"\
313-
[COMPILING] foo v0.5.0 ({})[..]
308+
[COMPILING] foo v0.5.0 (CWD)[..]
314309
[FINISHED] release [optimized] target(s) in [..]
315310
[RUNNING] target/release/deps/foo-[..][EXE]",
316-
p.url()
317311
)).with_either_contains(
318312
"[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]",
319313
).with_either_contains("[..]left: `\"hello\"`[..]")
@@ -378,11 +372,10 @@ fn bench_with_lib_dep() {
378372
p.cargo("bench")
379373
.with_stderr(&format!(
380374
"\
381-
[COMPILING] foo v0.0.1 ({})
375+
[COMPILING] foo v0.0.1 (CWD)
382376
[FINISHED] release [optimized] target(s) in [..]
383377
[RUNNING] target/release/deps/foo-[..][EXE]
384378
[RUNNING] target/release/deps/baz-[..][EXE]",
385-
p.url()
386379
)).with_stdout_contains("test lib_bench ... bench: [..]")
387380
.with_stdout_contains("test bin_bench ... bench: [..]")
388381
.run();
@@ -440,10 +433,9 @@ fn bench_with_deep_lib_dep() {
440433
.with_stderr(&format!(
441434
"\
442435
[COMPILING] foo v0.0.1 ([..])
443-
[COMPILING] bar v0.0.1 ({dir})
436+
[COMPILING] bar v0.0.1 (CWD)
444437
[FINISHED] release [optimized] target(s) in [..]
445438
[RUNNING] target/release/deps/bar-[..][EXE]",
446-
dir = p.url()
447439
)).with_stdout_contains("test bar_bench ... bench: [..]")
448440
.run();
449441
}
@@ -494,11 +486,10 @@ fn external_bench_explicit() {
494486
p.cargo("bench")
495487
.with_stderr(&format!(
496488
"\
497-
[COMPILING] foo v0.0.1 ({})
489+
[COMPILING] foo v0.0.1 (CWD)
498490
[FINISHED] release [optimized] target(s) in [..]
499491
[RUNNING] target/release/deps/foo-[..][EXE]
500492
[RUNNING] target/release/deps/bench-[..][EXE]",
501-
p.url()
502493
)).with_stdout_contains("test internal_bench ... bench: [..]")
503494
.with_stdout_contains("test external_bench ... bench: [..]")
504495
.run();
@@ -539,11 +530,10 @@ fn external_bench_implicit() {
539530
p.cargo("bench")
540531
.with_stderr(&format!(
541532
"\
542-
[COMPILING] foo v0.0.1 ({})
533+
[COMPILING] foo v0.0.1 (CWD)
543534
[FINISHED] release [optimized] target(s) in [..]
544535
[RUNNING] target/release/deps/foo-[..][EXE]
545536
[RUNNING] target/release/deps/external-[..][EXE]",
546-
p.url()
547537
)).with_stdout_contains("test internal_bench ... bench: [..]")
548538
.with_stdout_contains("test external_bench ... bench: [..]")
549539
.run();
@@ -615,11 +605,10 @@ automatically infer them to be a target, such as in subfolders.
615605
616606
For more information on this warning you can consult
617607
https://github.com/rust-lang/cargo/issues/5330
618-
[COMPILING] foo v0.0.1 ({})
608+
[COMPILING] foo v0.0.1 (CWD)
619609
[FINISHED] release [optimized] target(s) in [..]
620610
[RUNNING] target/release/deps/foo-[..][EXE]
621611
",
622-
p.url()
623612
)).run();
624613
}
625614

@@ -660,10 +649,9 @@ fn pass_through_command_line() {
660649
p.cargo("bench bar")
661650
.with_stderr(&format!(
662651
"\
663-
[COMPILING] foo v0.0.1 ({dir})
652+
[COMPILING] foo v0.0.1 (CWD)
664653
[FINISHED] release [optimized] target(s) in [..]
665654
[RUNNING] target/release/deps/foo-[..][EXE]",
666-
dir = p.url()
667655
)).with_stdout_contains("test bar ... bench: [..]")
668656
.run();
669657

@@ -748,11 +736,10 @@ fn lib_bin_same_name() {
748736
p.cargo("bench")
749737
.with_stderr(&format!(
750738
"\
751-
[COMPILING] foo v0.0.1 ({})
739+
[COMPILING] foo v0.0.1 (CWD)
752740
[FINISHED] release [optimized] target(s) in [..]
753741
[RUNNING] target/release/deps/foo-[..][EXE]
754742
[RUNNING] target/release/deps/foo-[..][EXE]",
755-
p.url()
756743
)).with_stdout_contains_n("test [..] ... bench: [..]", 2)
757744
.run();
758745
}
@@ -795,11 +782,10 @@ fn lib_with_standard_name() {
795782
p.cargo("bench")
796783
.with_stderr(&format!(
797784
"\
798-
[COMPILING] syntax v0.0.1 ({dir})
785+
[COMPILING] syntax v0.0.1 (CWD)
799786
[FINISHED] release [optimized] target(s) in [..]
800787
[RUNNING] target/release/deps/syntax-[..][EXE]
801788
[RUNNING] target/release/deps/bench-[..][EXE]",
802-
dir = p.url()
803789
)).with_stdout_contains("test foo_bench ... bench: [..]")
804790
.with_stdout_contains("test bench ... bench: [..]")
805791
.run();
@@ -845,10 +831,9 @@ fn lib_with_standard_name2() {
845831
p.cargo("bench")
846832
.with_stderr(&format!(
847833
"\
848-
[COMPILING] syntax v0.0.1 ({dir})
834+
[COMPILING] syntax v0.0.1 (CWD)
849835
[FINISHED] release [optimized] target(s) in [..]
850836
[RUNNING] target/release/deps/syntax-[..][EXE]",
851-
dir = p.url()
852837
)).with_stdout_contains("test bench ... bench: [..]")
853838
.run();
854839
}
@@ -916,29 +901,27 @@ fn bench_dylib() {
916901
p.cargo("bench -v")
917902
.with_stderr(&format!(
918903
"\
919-
[COMPILING] bar v0.0.1 ({dir}/bar)
904+
[COMPILING] bar v0.0.1 (CWD/bar)
920905
[RUNNING] [..] -C opt-level=3 [..]
921-
[COMPILING] foo v0.0.1 ({dir})
906+
[COMPILING] foo v0.0.1 (CWD)
922907
[RUNNING] [..] -C opt-level=3 [..]
923908
[RUNNING] [..] -C opt-level=3 [..]
924909
[RUNNING] [..] -C opt-level=3 [..]
925910
[FINISHED] release [optimized] target(s) in [..]
926911
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
927912
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
928-
dir = p.url()
929913
)).with_stdout_contains_n("test foo ... bench: [..]", 2)
930914
.run();
931915

932916
p.root().move_into_the_past();
933917
p.cargo("bench -v")
934918
.with_stderr(&format!(
935919
"\
936-
[FRESH] bar v0.0.1 ({dir}/bar)
937-
[FRESH] foo v0.0.1 ({dir})
920+
[FRESH] bar v0.0.1 (CWD/bar)
921+
[FRESH] foo v0.0.1 (CWD)
938922
[FINISHED] release [optimized] target(s) in [..]
939923
[RUNNING] `[..]target/release/deps/foo-[..][EXE] --bench`
940924
[RUNNING] `[..]target/release/deps/bench-[..][EXE] --bench`",
941-
dir = p.url()
942925
)).with_stdout_contains_n("test foo ... bench: [..]", 2)
943926
.run();
944927
}
@@ -974,10 +957,9 @@ fn bench_twice_with_build_cmd() {
974957
p.cargo("bench")
975958
.with_stderr(&format!(
976959
"\
977-
[COMPILING] foo v0.0.1 ({dir})
960+
[COMPILING] foo v0.0.1 (CWD)
978961
[FINISHED] release [optimized] target(s) in [..]
979962
[RUNNING] target/release/deps/foo-[..][EXE]",
980-
dir = p.url()
981963
)).with_stdout_contains("test foo ... bench: [..]")
982964
.run();
983965

@@ -1059,15 +1041,13 @@ fn bench_with_examples() {
10591041
p.cargo("bench -v")
10601042
.with_stderr(&format!(
10611043
"\
1062-
[COMPILING] foo v6.6.6 ({url})
1044+
[COMPILING] foo v6.6.6 (CWD)
10631045
[RUNNING] `rustc [..]`
10641046
[RUNNING] `rustc [..]`
10651047
[RUNNING] `rustc [..]`
10661048
[FINISHED] release [optimized] target(s) in [..]
1067-
[RUNNING] `{dir}/target/release/deps/foo-[..][EXE] --bench`
1068-
[RUNNING] `{dir}/target/release/deps/testb1-[..][EXE] --bench`",
1069-
dir = p.root().display(),
1070-
url = p.url()
1049+
[RUNNING] `CWD/target/release/deps/foo-[..][EXE] --bench`
1050+
[RUNNING] `CWD/target/release/deps/testb1-[..][EXE] --bench`",
10711051
)).with_stdout_contains("test bench_bench1 ... bench: [..]")
10721052
.with_stdout_contains("test bench_bench2 ... bench: [..]")
10731053
.run();

0 commit comments

Comments
 (0)