Skip to content

Commit 844d7ae

Browse files
nrcnrc
committed
Fixup tests
1 parent 655decc commit 844d7ae

File tree

8 files changed

+51
-47
lines changed

8 files changed

+51
-47
lines changed

‎tests/build-lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use hamcrest::{assert_that};
77
fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
88
format!("\
99
[COMPILING] {name} v{version} ({url})
10-
[RUNNING] `rustc --crate-name {name} src[/]lib.rs --crate-type lib -g \
10+
[RUNNING] `rustc --crate-name {name} src[/]lib.rs --crate-type lib \
11+
--emit=dep-info,link -g \
1112
-C metadata=[..] \
1213
--out-dir [..] \
13-
--emit=dep-info,link \
1414
-L dependency={dir}[/]target[/]debug[/]deps`
1515
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
1616
",

‎tests/build-script.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -765,19 +765,22 @@ fn build_cmd_with_a_build_cmd() {
765765
[COMPILING] a v0.5.0 (file://[..])
766766
[RUNNING] `rustc [..] a[/]build.rs [..] --extern b=[..]`
767767
[RUNNING] `[..][/]a-[..][/]build-script-build`
768-
[RUNNING] `rustc --crate-name a [..]lib.rs --crate-type lib -g \
768+
[RUNNING] `rustc --crate-name a [..]lib.rs --crate-type lib \
769+
--emit=dep-info,link -g \
769770
-C metadata=[..] \
770-
--out-dir [..]target[/]debug[/]deps --emit=dep-info,link \
771+
--out-dir [..]target[/]debug[/]deps \
771772
-L [..]target[/]debug[/]deps`
772773
[COMPILING] foo v0.5.0 (file://[..])
773774
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin \
774-
-g -C metadata=[..] --out-dir [..] --emit=dep-info,link \
775+
--emit=dep-info,link \
776+
-g -C metadata=[..] --out-dir [..] \
775777
-L [..]target[/]debug[/]deps \
776778
--extern a=[..]liba[..].rlib`
777779
[RUNNING] `[..][/]foo-[..][/]build-script-build`
778-
[RUNNING] `rustc --crate-name foo [..]lib.rs --crate-type lib -g \
780+
[RUNNING] `rustc --crate-name foo [..]lib.rs --crate-type lib \
781+
--emit=dep-info,link -g \
779782
-C metadata=[..] \
780-
--out-dir [..] --emit=dep-info,link \
783+
--out-dir [..] \
781784
-L [..]target[/]debug[/]deps`
782785
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
783786
"));

‎tests/build.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -794,21 +794,20 @@ fn cargo_default_env_metadata_env_var() {
794794
execs().with_status(0).with_stderr(&format!("\
795795
[COMPILING] bar v0.0.1 ({url}/bar)
796796
[RUNNING] `rustc --crate-name bar bar[/]src[/]lib.rs --crate-type dylib \
797+
--emit=dep-info,link \
797798
-C prefer-dynamic -g \
798799
-C metadata=[..] \
799800
--out-dir [..] \
800-
--emit=dep-info,link \
801801
-L dependency={dir}[/]target[/]debug[/]deps`
802802
[COMPILING] foo v0.0.1 ({url})
803-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
803+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
804+
--emit=dep-info,link -g \
804805
-C metadata=[..] \
805806
-C extra-filename=[..] \
806807
--out-dir [..] \
807-
--emit=dep-info,link \
808808
-L dependency={dir}[/]target[/]debug[/]deps \
809809
--extern bar={dir}[/]target[/]debug[/]deps[/]{prefix}bar{suffix}`
810-
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
811-
",
810+
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]",
812811
dir = p.root().display(),
813812
url = p.url(),
814813
prefix = env::consts::DLL_PREFIX,
@@ -822,17 +821,17 @@ suffix = env::consts::DLL_SUFFIX,
822821
execs().with_status(0).with_stderr(&format!("\
823822
[COMPILING] bar v0.0.1 ({url}/bar)
824823
[RUNNING] `rustc --crate-name bar bar[/]src[/]lib.rs --crate-type dylib \
824+
--emit=dep-info,link \
825825
-C prefer-dynamic -g \
826826
-C metadata=[..] \
827827
--out-dir [..] \
828-
--emit=dep-info,link \
829828
-L dependency={dir}[/]target[/]debug[/]deps`
830829
[COMPILING] foo v0.0.1 ({url})
831-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
830+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
831+
--emit=dep-info,link -g \
832832
-C metadata=[..] \
833833
-C extra-filename=[..] \
834834
--out-dir [..] \
835-
--emit=dep-info,link \
836835
-L dependency={dir}[/]target[/]debug[/]deps \
837836
--extern bar={dir}[/]target[/]debug[/]deps[/]{prefix}bar-[..]{suffix}`
838837
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
@@ -1142,11 +1141,11 @@ fn lto_build() {
11421141
execs().with_status(0).with_stderr(&format!("\
11431142
[COMPILING] test v0.0.0 ({url})
11441143
[RUNNING] `rustc --crate-name test src[/]main.rs --crate-type bin \
1144+
--emit=dep-info,link \
11451145
-C opt-level=3 \
11461146
-C lto \
11471147
-C metadata=[..] \
11481148
--out-dir {dir}[/]target[/]release[/]deps \
1149-
--emit=dep-info,link \
11501149
-L dependency={dir}[/]target[/]release[/]deps`
11511150
[FINISHED] release [optimized] target(s) in [..]
11521151
",
@@ -1170,10 +1169,10 @@ fn verbose_build() {
11701169
assert_that(p.cargo_process("build").arg("-v"),
11711170
execs().with_status(0).with_stderr(&format!("\
11721171
[COMPILING] test v0.0.0 ({url})
1173-
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib -g \
1172+
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
1173+
--emit=dep-info,link -g \
11741174
-C metadata=[..] \
11751175
--out-dir [..] \
1176-
--emit=dep-info,link \
11771176
-L dependency={dir}[/]target[/]debug[/]deps`
11781177
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
11791178
",
@@ -1198,10 +1197,10 @@ fn verbose_release_build() {
11981197
execs().with_status(0).with_stderr(&format!("\
11991198
[COMPILING] test v0.0.0 ({url})
12001199
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
1200+
--emit=dep-info,link \
12011201
-C opt-level=3 \
12021202
-C metadata=[..] \
12031203
--out-dir [..] \
1204-
--emit=dep-info,link \
12051204
-L dependency={dir}[/]target[/]release[/]deps`
12061205
[FINISHED] release [optimized] target(s) in [..]
12071206
",
@@ -1241,18 +1240,19 @@ fn verbose_release_build_deps() {
12411240
execs().with_status(0).with_stderr(&format!("\
12421241
[COMPILING] foo v0.0.0 ({url}/foo)
12431242
[RUNNING] `rustc --crate-name foo foo[/]src[/]lib.rs \
1244-
--crate-type dylib --crate-type rlib -C prefer-dynamic \
1243+
--crate-type dylib --crate-type rlib \
1244+
--emit=dep-info,link \
1245+
-C prefer-dynamic \
12451246
-C opt-level=3 \
12461247
-C metadata=[..] \
12471248
--out-dir [..] \
1248-
--emit=dep-info,link \
12491249
-L dependency={dir}[/]target[/]release[/]deps`
12501250
[COMPILING] test v0.0.0 ({url})
12511251
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
1252+
--emit=dep-info,link \
12521253
-C opt-level=3 \
12531254
-C metadata=[..] \
12541255
--out-dir [..] \
1255-
--emit=dep-info,link \
12561256
-L dependency={dir}[/]target[/]release[/]deps \
12571257
--extern foo={dir}[/]target[/]release[/]deps[/]{prefix}foo{suffix} \
12581258
--extern foo={dir}[/]target[/]release[/]deps[/]libfoo.rlib`

‎tests/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ fn issue_3418() {
244244

245245
assert_that(foo.cargo_process("check").arg("-v"),
246246
execs().with_status(0)
247-
.with_stderr_does_not_contain("--crate-type lib"));
247+
.with_stderr_contains("[..] --emit=dep-info,metadata [..]"));
248248
}
249249

250250
// Some weirdness that seems to be caused by a crate being built as well as

‎tests/cross-compile.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ fn linker_and_ar() {
357357
execs().with_status(101)
358358
.with_stderr_contains(&format!("\
359359
[COMPILING] foo v0.5.0 ({url})
360-
[RUNNING] `rustc --crate-name foo src[/]foo.rs --crate-type bin -g \
360+
[RUNNING] `rustc --crate-name foo src[/]foo.rs --crate-type bin \
361+
--emit=dep-info,link -g \
361362
-C metadata=[..] \
362363
--out-dir {dir}[/]target[/]{target}[/]debug[/]deps \
363-
--emit=dep-info,link \
364364
--target {target} \
365365
-C ar=my-ar-tool -C linker=my-linker-tool \
366366
-L dependency={dir}[/]target[/]{target}[/]debug[/]deps \

‎tests/profiles.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ fn profile_overrides() {
2828
execs().with_status(0).with_stderr(&format!("\
2929
[COMPILING] test v0.0.0 ({url})
3030
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
31+
--emit=dep-info,link \
3132
-C opt-level=1 \
3233
-C debug-assertions=on \
3334
-C metadata=[..] \
3435
-C rpath \
3536
--out-dir [..] \
36-
--emit=dep-info,link \
3737
-L dependency={dir}[/]target[/]debug[/]deps`
3838
[FINISHED] debug [optimized] target(s) in [..]
3939
",
@@ -61,10 +61,10 @@ fn opt_level_override_0() {
6161
execs().with_status(0).with_stderr(&format!("\
6262
[COMPILING] test v0.0.0 ({url})
6363
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
64+
--emit=dep-info,link \
6465
-g \
6566
-C metadata=[..] \
6667
--out-dir [..] \
67-
--emit=dep-info,link \
6868
-L dependency={dir}[/]target[/]debug[/]deps`
6969
[FINISHED] [..] target(s) in [..]
7070
",
@@ -91,12 +91,12 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) {
9191
execs().with_status(0).with_stderr(&format!("\
9292
[COMPILING] test v0.0.0 ({url})
9393
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
94+
--emit=dep-info,link \
9495
-C opt-level={level} \
9596
-g \
9697
-C debug-assertions=on \
9798
-C metadata=[..] \
9899
--out-dir [..] \
99-
--emit=dep-info,link \
100100
-L dependency={dir}[/]target[/]debug[/]deps`
101101
[FINISHED] [..] target(s) in [..]
102102
",
@@ -160,20 +160,21 @@ fn top_level_overrides_deps() {
160160
execs().with_status(0).with_stderr(&format!("\
161161
[COMPILING] foo v0.0.0 ({url}/foo)
162162
[RUNNING] `rustc --crate-name foo foo[/]src[/]lib.rs \
163-
--crate-type dylib --crate-type rlib -C prefer-dynamic \
163+
--crate-type dylib --crate-type rlib \
164+
--emit=dep-info,link \
165+
-C prefer-dynamic \
164166
-C opt-level=1 \
165167
-g \
166168
-C metadata=[..] \
167169
--out-dir {dir}[/]target[/]release[/]deps \
168-
--emit=dep-info,link \
169170
-L dependency={dir}[/]target[/]release[/]deps`
170171
[COMPILING] test v0.0.0 ({url})
171172
[RUNNING] `rustc --crate-name test src[/]lib.rs --crate-type lib \
173+
--emit=dep-info,link \
172174
-C opt-level=1 \
173175
-g \
174176
-C metadata=[..] \
175177
--out-dir [..] \
176-
--emit=dep-info,link \
177178
-L dependency={dir}[/]target[/]release[/]deps \
178179
--extern foo={dir}[/]target[/]release[/]deps[/]\
179180
{prefix}foo[..]{suffix} \

‎tests/run.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,17 +417,17 @@ fn example_with_release_flag() {
417417
.with_stderr(&format!("\
418418
[COMPILING] bar v0.0.1 ({url}/bar)
419419
[RUNNING] `rustc --crate-name bar bar[/]src[/]bar.rs --crate-type lib \
420+
--emit=dep-info,link \
420421
-C opt-level=3 \
421422
-C metadata=[..] \
422423
--out-dir {dir}[/]target[/]release[/]deps \
423-
--emit=dep-info,link \
424424
-L dependency={dir}[/]target[/]release[/]deps`
425425
[COMPILING] foo v0.0.1 ({url})
426426
[RUNNING] `rustc --crate-name a examples[/]a.rs --crate-type bin \
427+
--emit=dep-info,link \
427428
-C opt-level=3 \
428429
-C metadata=[..] \
429430
--out-dir {dir}[/]target[/]release[/]examples \
430-
--emit=dep-info,link \
431431
-L dependency={dir}[/]target[/]release[/]deps \
432432
--extern bar={dir}[/]target[/]release[/]deps[/]libbar-[..].rlib`
433433
[FINISHED] release [optimized] target(s) in [..]
@@ -445,17 +445,17 @@ fast2"));
445445
.with_stderr(&format!("\
446446
[COMPILING] bar v0.0.1 ({url}/bar)
447447
[RUNNING] `rustc --crate-name bar bar[/]src[/]bar.rs --crate-type lib \
448+
--emit=dep-info,link \
448449
-g \
449450
-C metadata=[..] \
450451
--out-dir {dir}[/]target[/]debug[/]deps \
451-
--emit=dep-info,link \
452452
-L dependency={dir}[/]target[/]debug[/]deps`
453453
[COMPILING] foo v0.0.1 ({url})
454454
[RUNNING] `rustc --crate-name a examples[/]a.rs --crate-type bin \
455+
--emit=dep-info,link \
455456
-g \
456457
-C metadata=[..] \
457458
--out-dir {dir}[/]target[/]debug[/]examples \
458-
--emit=dep-info,link \
459459
-L dependency={dir}[/]target[/]debug[/]deps \
460460
--extern bar={dir}[/]target[/]debug[/]deps[/]libbar-[..].rlib`
461461
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]

‎tests/rustc.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ fn build_lib_for_foo() {
2727
.with_status(0)
2828
.with_stderr(format!("\
2929
[COMPILING] foo v0.0.1 ({url})
30-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
30+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
31+
--emit=dep-info,link -g \
3132
-C metadata=[..] \
3233
--out-dir [..] \
33-
--emit=dep-info,link \
3434
-L dependency={dir}[/]target[/]debug[/]deps`
3535
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
3636
", dir = p.root().display(), url = p.url())));
@@ -56,11 +56,11 @@ fn lib() {
5656
.with_status(0)
5757
.with_stderr(format!("\
5858
[COMPILING] foo v0.0.1 ({url})
59-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
59+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib \
60+
--emit=dep-info,link -g \
6061
-C debug-assertions=off \
6162
-C metadata=[..] \
6263
--out-dir [..] \
63-
--emit=dep-info,link \
6464
-L dependency={dir}[/]target[/]debug[/]deps`
6565
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
6666
", dir = p.root().display(), url = p.url())))
@@ -86,16 +86,16 @@ fn build_main_and_allow_unstable_options() {
8686
.with_status(0)
8787
.with_stderr(&format!("\
8888
[COMPILING] {name} v{version} ({url})
89-
[RUNNING] `rustc --crate-name {name} src[/]lib.rs --crate-type lib -g \
89+
[RUNNING] `rustc --crate-name {name} src[/]lib.rs --crate-type lib \
90+
--emit=dep-info,link -g \
9091
-C metadata=[..] \
9192
--out-dir [..] \
92-
--emit=dep-info,link \
9393
-L dependency={dir}[/]target[/]debug[/]deps`
94-
[RUNNING] `rustc --crate-name {name} src[/]main.rs --crate-type bin -g \
94+
[RUNNING] `rustc --crate-name {name} src[/]main.rs --crate-type bin \
95+
--emit=dep-info,link -g \
9596
-C debug-assertions \
9697
-C metadata=[..] \
9798
--out-dir [..] \
98-
--emit=dep-info,link \
9999
-L dependency={dir}[/]target[/]debug[/]deps \
100100
--extern {name}={dir}[/]target[/]debug[/]deps[/]lib{name}-[..].rlib`
101101
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
@@ -151,10 +151,10 @@ fn build_with_args_to_one_of_multiple_binaries() {
151151
.with_status(0)
152152
.with_stderr(format!("\
153153
[COMPILING] foo v0.0.1 ({url})
154-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
154+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib --emit=dep-info,link -g \
155155
-C metadata=[..] \
156156
--out-dir [..]`
157-
[RUNNING] `rustc --crate-name bar src[/]bin[/]bar.rs --crate-type bin -g \
157+
[RUNNING] `rustc --crate-name bar src[/]bin[/]bar.rs --crate-type bin --emit=dep-info,link -g \
158158
-C debug-assertions [..]`
159159
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
160160
", url = p.url())));
@@ -207,10 +207,10 @@ fn build_with_args_to_one_of_multiple_tests() {
207207
.with_status(0)
208208
.with_stderr(format!("\
209209
[COMPILING] foo v0.0.1 ({url})
210-
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib -g \
210+
[RUNNING] `rustc --crate-name foo src[/]lib.rs --crate-type lib --emit=dep-info,link -g \
211211
-C metadata=[..] \
212212
--out-dir [..]`
213-
[RUNNING] `rustc --crate-name bar tests[/]bar.rs -g \
213+
[RUNNING] `rustc --crate-name bar tests[/]bar.rs --emit=dep-info,link -g \
214214
-C debug-assertions [..]--test[..]`
215215
[FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
216216
", url = p.url())));

0 commit comments

Comments
 (0)