Skip to content

Commit 04c8372

Browse files
guswynnguswynn
committed
fix test suite
1 parent 70d54be commit 04c8372

File tree

7 files changed

+118
-118
lines changed

7 files changed

+118
-118
lines changed

‎tests/testsuite/bench.rs

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn cargo_bench_simple() {
4545
"\
4646
[COMPILING] foo v0.5.0 ([CWD])
4747
[FINISHED] bench [optimized] target(s) in [..]
48-
[RUNNING] target/release/deps/foo-[..][EXE]",
48+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
4949
)
5050
.with_stdout_contains("test bench_hello ... bench: [..]")
5151
.run();
@@ -91,8 +91,8 @@ fn bench_bench_implicit() {
9191
"\
9292
[COMPILING] foo v0.0.1 ([CWD])
9393
[FINISHED] bench [optimized] target(s) in [..]
94-
[RUNNING] target/release/deps/foo-[..][EXE]
95-
[RUNNING] target/release/deps/mybench-[..][EXE]
94+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
95+
[RUNNING] [..] (target/release/deps/mybench-[..][EXE])
9696
",
9797
)
9898
.with_stdout_contains("test run2 ... bench: [..]")
@@ -139,7 +139,7 @@ fn bench_bin_implicit() {
139139
"\
140140
[COMPILING] foo v0.0.1 ([CWD])
141141
[FINISHED] bench [optimized] target(s) in [..]
142-
[RUNNING] target/release/deps/foo-[..][EXE]
142+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
143143
",
144144
)
145145
.with_stdout_contains("test run1 ... bench: [..]")
@@ -176,7 +176,7 @@ fn bench_tarname() {
176176
"\
177177
[COMPILING] foo v0.0.1 ([CWD])
178178
[FINISHED] bench [optimized] target(s) in [..]
179-
[RUNNING] target/release/deps/bin2-[..][EXE]
179+
[RUNNING] [..] (target/release/deps/bin2-[..][EXE])
180180
",
181181
)
182182
.with_stdout_contains("test run2 ... bench: [..]")
@@ -344,7 +344,7 @@ fn cargo_bench_failing_test() {
344344
"\
345345
[COMPILING] foo v0.5.0 ([CWD])[..]
346346
[FINISHED] bench [optimized] target(s) in [..]
347-
[RUNNING] target/release/deps/foo-[..][EXE]",
347+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
348348
)
349349
.with_either_contains(
350350
"[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]",
@@ -416,8 +416,8 @@ fn bench_with_lib_dep() {
416416
"\
417417
[COMPILING] foo v0.0.1 ([CWD])
418418
[FINISHED] bench [optimized] target(s) in [..]
419-
[RUNNING] target/release/deps/foo-[..][EXE]
420-
[RUNNING] target/release/deps/baz-[..][EXE]",
419+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
420+
[RUNNING] [..] (target/release/deps/baz-[..][EXE])",
421421
)
422422
.with_stdout_contains("test lib_bench ... bench: [..]")
423423
.with_stdout_contains("test bin_bench ... bench: [..]")
@@ -481,7 +481,7 @@ fn bench_with_deep_lib_dep() {
481481
[COMPILING] foo v0.0.1 ([..])
482482
[COMPILING] bar v0.0.1 ([CWD])
483483
[FINISHED] bench [optimized] target(s) in [..]
484-
[RUNNING] target/release/deps/bar-[..][EXE]",
484+
[RUNNING] [..] (target/release/deps/bar-[..][EXE])",
485485
)
486486
.with_stdout_contains("test bar_bench ... bench: [..]")
487487
.run();
@@ -538,8 +538,8 @@ fn external_bench_explicit() {
538538
"\
539539
[COMPILING] foo v0.0.1 ([CWD])
540540
[FINISHED] bench [optimized] target(s) in [..]
541-
[RUNNING] target/release/deps/foo-[..][EXE]
542-
[RUNNING] target/release/deps/bench-[..][EXE]",
541+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
542+
[RUNNING] [..] (target/release/deps/bench-[..][EXE])",
543543
)
544544
.with_stdout_contains("test internal_bench ... bench: [..]")
545545
.with_stdout_contains("test external_bench ... bench: [..]")
@@ -585,8 +585,8 @@ fn external_bench_implicit() {
585585
"\
586586
[COMPILING] foo v0.0.1 ([CWD])
587587
[FINISHED] bench [optimized] target(s) in [..]
588-
[RUNNING] target/release/deps/foo-[..][EXE]
589-
[RUNNING] target/release/deps/external-[..][EXE]",
588+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
589+
[RUNNING] [..] (target/release/deps/external-[..][EXE])",
590590
)
591591
.with_stdout_contains("test internal_bench ... bench: [..]")
592592
.with_stdout_contains("test external_bench ... bench: [..]")
@@ -664,7 +664,7 @@ For more information on this warning you can consult
664664
https://github.com/rust-lang/cargo/issues/5330
665665
[COMPILING] foo v0.0.1 ([CWD])
666666
[FINISHED] bench [optimized] target(s) in [..]
667-
[RUNNING] target/release/deps/foo-[..][EXE]
667+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
668668
",
669669
)
670670
.run();
@@ -711,15 +711,15 @@ fn pass_through_command_line() {
711711
"\
712712
[COMPILING] foo v0.0.1 ([CWD])
713713
[FINISHED] bench [optimized] target(s) in [..]
714-
[RUNNING] target/release/deps/foo-[..][EXE]",
714+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
715715
)
716716
.with_stdout_contains("test bar ... bench: [..]")
717717
.run();
718718

719719
p.cargo("bench foo")
720720
.with_stderr(
721721
"[FINISHED] bench [optimized] target(s) in [..]
722-
[RUNNING] target/release/deps/foo-[..][EXE]",
722+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
723723
)
724724
.with_stdout_contains("test foo ... bench: [..]")
725725
.run();
@@ -804,8 +804,8 @@ fn lib_bin_same_name() {
804804
"\
805805
[COMPILING] foo v0.0.1 ([CWD])
806806
[FINISHED] bench [optimized] target(s) in [..]
807-
[RUNNING] target/release/deps/foo-[..][EXE]
808-
[RUNNING] target/release/deps/foo-[..][EXE]",
807+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])
808+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
809809
)
810810
.with_stdout_contains_n("test [..] ... bench: [..]", 2)
811811
.run();
@@ -853,8 +853,8 @@ fn lib_with_standard_name() {
853853
"\
854854
[COMPILING] syntax v0.0.1 ([CWD])
855855
[FINISHED] bench [optimized] target(s) in [..]
856-
[RUNNING] target/release/deps/syntax-[..][EXE]
857-
[RUNNING] target/release/deps/bench-[..][EXE]",
856+
[RUNNING] [..] (target/release/deps/syntax-[..][EXE])
857+
[RUNNING] [..] (target/release/deps/bench-[..][EXE])",
858858
)
859859
.with_stdout_contains("test foo_bench ... bench: [..]")
860860
.with_stdout_contains("test bench ... bench: [..]")
@@ -905,7 +905,7 @@ fn lib_with_standard_name2() {
905905
"\
906906
[COMPILING] syntax v0.0.1 ([CWD])
907907
[FINISHED] bench [optimized] target(s) in [..]
908-
[RUNNING] target/release/deps/syntax-[..][EXE]",
908+
[RUNNING] [..] (target/release/deps/syntax-[..][EXE])",
909909
)
910910
.with_stdout_contains("test bench ... bench: [..]")
911911
.run();
@@ -1040,15 +1040,15 @@ fn bench_twice_with_build_cmd() {
10401040
"\
10411041
[COMPILING] foo v0.0.1 ([CWD])
10421042
[FINISHED] bench [optimized] target(s) in [..]
1043-
[RUNNING] target/release/deps/foo-[..][EXE]",
1043+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
10441044
)
10451045
.with_stdout_contains("test foo ... bench: [..]")
10461046
.run();
10471047

10481048
p.cargo("bench")
10491049
.with_stderr(
10501050
"[FINISHED] bench [optimized] target(s) in [..]
1051-
[RUNNING] target/release/deps/foo-[..][EXE]",
1051+
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
10521052
)
10531053
.with_stdout_contains("test foo ... bench: [..]")
10541054
.run();
@@ -1175,7 +1175,7 @@ fn test_a_bench() {
11751175
"\
11761176
[COMPILING] foo v0.1.0 ([..])
11771177
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
1178-
[RUNNING] target/debug/deps/b-[..][EXE]",
1178+
[RUNNING] [..] (target/debug/deps/b-[..][EXE])",
11791179
)
11801180
.with_stdout_contains("test foo ... ok")
11811181
.run();
@@ -1251,9 +1251,9 @@ fn test_bench_no_fail_fast() {
12511251

12521252
p.cargo("bench --no-fail-fast -- --test-threads=1")
12531253
.with_status(101)
1254-
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
1254+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/foo-[..][EXE])")
12551255
.with_stdout_contains("running 2 tests")
1256-
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
1256+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/foo-[..][EXE])")
12571257
.with_stdout_contains("test bench_hello [..]")
12581258
.with_stdout_contains("test bench_nope [..]")
12591259
.run();
@@ -1345,9 +1345,9 @@ fn test_bench_multiple_packages() {
13451345
.build();
13461346

13471347
p.cargo("bench -p bar -p baz")
1348-
.with_stderr_contains("[RUNNING] target/release/deps/bbaz-[..][EXE]")
1348+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/bbaz-[..][EXE])")
13491349
.with_stdout_contains("test bench_baz ... bench: [..]")
1350-
.with_stderr_contains("[RUNNING] target/release/deps/bbar-[..][EXE]")
1350+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/bbar-[..][EXE])")
13511351
.with_stdout_contains("test bench_bar ... bench: [..]")
13521352
.run();
13531353
}
@@ -1402,9 +1402,9 @@ fn bench_all_workspace() {
14021402
.build();
14031403

14041404
p.cargo("bench --workspace")
1405-
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
1405+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/bar-[..][EXE])")
14061406
.with_stdout_contains("test bench_bar ... bench: [..]")
1407-
.with_stderr_contains("[RUNNING] target/release/deps/foo-[..][EXE]")
1407+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/foo-[..][EXE])")
14081408
.with_stdout_contains("test bench_foo ... bench: [..]")
14091409
.run();
14101410
}
@@ -1553,9 +1553,9 @@ fn bench_all_virtual_manifest() {
15531553

15541554
// The order in which bar and baz are built is not guaranteed
15551555
p.cargo("bench --workspace")
1556-
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
1556+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/baz-[..][EXE])")
15571557
.with_stdout_contains("test bench_baz ... bench: [..]")
1558-
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
1558+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/bar-[..][EXE])")
15591559
.with_stdout_contains("test bench_bar ... bench: [..]")
15601560
.run();
15611561
}
@@ -1606,9 +1606,9 @@ fn bench_virtual_manifest_glob() {
16061606

16071607
// The order in which bar and baz are built is not guaranteed
16081608
p.cargo("bench -p '*z'")
1609-
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
1609+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/baz-[..][EXE])")
16101610
.with_stdout_contains("test bench_baz ... bench: [..]")
1611-
.with_stderr_does_not_contain("[RUNNING] target/release/deps/bar-[..][EXE]")
1611+
.with_stderr_does_not_contain("[RUNNING] [..] (target/release/deps/bar-[..][EXE])")
16121612
.with_stdout_does_not_contain("test bench_bar ... bench: [..]")
16131613
.run();
16141614
}
@@ -1699,9 +1699,9 @@ fn bench_virtual_manifest_all_implied() {
16991699
// The order in which bar and baz are built is not guaranteed
17001700

17011701
p.cargo("bench")
1702-
.with_stderr_contains("[RUNNING] target/release/deps/baz-[..][EXE]")
1702+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/baz-[..][EXE])")
17031703
.with_stdout_contains("test bench_baz ... bench: [..]")
1704-
.with_stderr_contains("[RUNNING] target/release/deps/bar-[..][EXE]")
1704+
.with_stderr_contains("[RUNNING] [..] (target/release/deps/bar-[..][EXE])")
17051705
.with_stdout_contains("test bench_bar ... bench: [..]")
17061706
.run();
17071707
}

‎tests/testsuite/cross_compile.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ fn cross_tests() {
350350
"\
351351
[COMPILING] foo v0.0.0 ([CWD])
352352
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
353-
[RUNNING] target/{triple}/debug/deps/foo-[..][EXE]
354-
[RUNNING] target/{triple}/debug/deps/bar-[..][EXE]",
353+
[RUNNING] [..] (target/{triple}/debug/deps/foo-[..][EXE])
354+
[RUNNING] [..] (target/{triple}/debug/deps/bar-[..][EXE])",
355355
triple = target
356356
))
357357
.with_stdout_contains("test test_foo ... ok")
@@ -380,7 +380,7 @@ fn no_cross_doctests() {
380380
let host_output = "\
381381
[COMPILING] foo v0.0.1 ([CWD])
382382
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
383-
[RUNNING] target/debug/deps/foo-[..][EXE]
383+
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])
384384
[DOCTEST] foo
385385
";
386386

@@ -395,7 +395,7 @@ fn no_cross_doctests() {
395395
"\
396396
[COMPILING] foo v0.0.1 ([CWD])
397397
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
398-
[RUNNING] target/{triple}/debug/deps/foo-[..][EXE]
398+
[RUNNING] [..] (target/{triple}/debug/deps/foo-[..][EXE])
399399
[DOCTEST] foo
400400
",
401401
triple = target
@@ -1060,8 +1060,8 @@ fn cross_test_dylib() {
10601060
[COMPILING] bar v0.0.1 ([CWD]/bar)
10611061
[COMPILING] foo v0.0.1 ([CWD])
10621062
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
1063-
[RUNNING] target/{arch}/debug/deps/foo-[..][EXE]
1064-
[RUNNING] target/{arch}/debug/deps/test-[..][EXE]",
1063+
[RUNNING] [..] (target/{arch}/debug/deps/foo-[..][EXE])
1064+
[RUNNING] [..] (target/{arch}/debug/deps/test-[..][EXE])",
10651065
arch = cross_compile::alternate()
10661066
))
10671067
.with_stdout_contains_n("test foo ... ok", 2)

‎tests/testsuite/freshness.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ fn changing_profiles_caches_targets() {
252252
"\
253253
[..]Compiling foo v0.0.1 ([..])
254254
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
255-
[RUNNING] target[..]debug[..]deps[..]foo-[..][EXE]
255+
[RUNNING] [..] (target[..]debug[..]deps[..]foo-[..][EXE])
256256
[DOCTEST] foo
257257
",
258258
)
@@ -268,7 +268,7 @@ fn changing_profiles_caches_targets() {
268268
.with_stderr(
269269
"\
270270
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
271-
[RUNNING] target[..]debug[..]deps[..]foo-[..][EXE]
271+
[RUNNING] [..] (target[..]debug[..]deps[..]foo-[..][EXE])
272272
",
273273
)
274274
.run();
@@ -2441,7 +2441,7 @@ fn linking_interrupted() {
24412441
"\
24422442
[COMPILING] foo [..]
24432443
[FINISHED] [..]
2444-
[RUNNING] target/debug/deps/t1[..]
2444+
[RUNNING] tests/t1.rs (target/debug/deps/t1[..])
24452445
",
24462446
)
24472447
.run();

‎tests/testsuite/git.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ fn dev_deps_with_testing() {
13011301
[COMPILING] [..] v0.5.0 ([..])
13021302
[COMPILING] [..] v0.5.0 ([..]
13031303
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
1304-
[RUNNING] target/debug/deps/foo-[..][EXE]",
1304+
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])",
13051305
)
13061306
.with_stdout_contains("test tests::foo ... ok")
13071307
.run();

‎tests/testsuite/path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ fn cargo_compile_with_root_dev_deps_with_testing() {
187187
[COMPILING] [..] v0.5.0 ([..])
188188
[COMPILING] [..] v0.5.0 ([..])
189189
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
190-
[RUNNING] target/debug/deps/foo-[..][EXE]",
190+
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])",
191191
)
192192
.with_stdout_contains("running 0 tests")
193193
.run();
@@ -770,7 +770,7 @@ fn dev_deps_no_rebuild_lib() {
770770
[COMPILING] [..] v0.5.0 ([CWD][..])
771771
[COMPILING] [..] v0.5.0 ([CWD][..])
772772
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]
773-
[RUNNING] target/debug/deps/foo-[..][EXE]",
773+
[RUNNING] [..] (target/debug/deps/foo-[..][EXE])",
774774
)
775775
.with_stdout_contains("running 0 tests")
776776
.run();

0 commit comments

Comments
 (0)