Skip to content

Commit 4779dbf

Browse files
kennytmkennytm
committed
Update the testsuite to include the explicit '--color' flags.
1 parent e7fb246 commit 4779dbf

12 files changed

+180
-180
lines changed

‎tests/testsuite/build.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,14 +1261,14 @@ fn cargo_default_env_metadata_env_var() {
12611261
.with_stderr(&format!(
12621262
"\
12631263
[COMPILING] bar v0.0.1 ([CWD]/bar)
1264-
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
1264+
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --color never --crate-type dylib \
12651265
--emit=dep-info,link \
12661266
-C prefer-dynamic -C debuginfo=2 \
12671267
-C metadata=[..] \
12681268
--out-dir [..] \
12691269
-L dependency=[CWD]/target/debug/deps`
12701270
[COMPILING] foo v0.0.1 ([CWD])
1271-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1271+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
12721272
--emit=dep-info,link -C debuginfo=2 \
12731273
-C metadata=[..] \
12741274
-C extra-filename=[..] \
@@ -1288,14 +1288,14 @@ fn cargo_default_env_metadata_env_var() {
12881288
.with_stderr(&format!(
12891289
"\
12901290
[COMPILING] bar v0.0.1 ([CWD]/bar)
1291-
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
1291+
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --color never --crate-type dylib \
12921292
--emit=dep-info,link \
12931293
-C prefer-dynamic -C debuginfo=2 \
12941294
-C metadata=[..] \
12951295
--out-dir [..] \
12961296
-L dependency=[CWD]/target/debug/deps`
12971297
[COMPILING] foo v0.0.1 ([CWD])
1298-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1298+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
12991299
--emit=dep-info,link -C debuginfo=2 \
13001300
-C metadata=[..] \
13011301
-C extra-filename=[..] \
@@ -1616,7 +1616,7 @@ fn lto_build() {
16161616
.with_stderr(
16171617
"\
16181618
[COMPILING] test v0.0.0 ([CWD])
1619-
[RUNNING] `rustc --crate-name test src/main.rs --crate-type bin \
1619+
[RUNNING] `rustc --crate-name test src/main.rs --color never --crate-type bin \
16201620
--emit=dep-info,link \
16211621
-C opt-level=3 \
16221622
-C lto \
@@ -1635,7 +1635,7 @@ fn verbose_build() {
16351635
.with_stderr(
16361636
"\
16371637
[COMPILING] foo v0.0.1 ([CWD])
1638-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1638+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
16391639
--emit=dep-info,link -C debuginfo=2 \
16401640
-C metadata=[..] \
16411641
--out-dir [..] \
@@ -1652,7 +1652,7 @@ fn verbose_release_build() {
16521652
.with_stderr(
16531653
"\
16541654
[COMPILING] foo v0.0.1 ([CWD])
1655-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1655+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
16561656
--emit=dep-info,link \
16571657
-C opt-level=3 \
16581658
-C metadata=[..] \
@@ -1698,7 +1698,7 @@ fn verbose_release_build_deps() {
16981698
.with_stderr(&format!(
16991699
"\
17001700
[COMPILING] foo v0.0.0 ([CWD]/foo)
1701-
[RUNNING] `rustc --crate-name foo foo/src/lib.rs \
1701+
[RUNNING] `rustc --crate-name foo foo/src/lib.rs --color never \
17021702
--crate-type dylib --crate-type rlib \
17031703
--emit=dep-info,link \
17041704
-C prefer-dynamic \
@@ -1707,7 +1707,7 @@ fn verbose_release_build_deps() {
17071707
--out-dir [..] \
17081708
-L dependency=[CWD]/target/release/deps`
17091709
[COMPILING] test v0.0.0 ([CWD])
1710-
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
1710+
[RUNNING] `rustc --crate-name test src/lib.rs --color never --crate-type lib \
17111711
--emit=dep-info,link \
17121712
-C opt-level=3 \
17131713
-C metadata=[..] \
@@ -4099,41 +4099,41 @@ fn build_filter_infer_profile() {
40994099
p.cargo("build -v")
41004100
.with_stderr_contains(
41014101
"\
4102-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4102+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41034103
--emit=dep-info,link[..]",
41044104
).with_stderr_contains(
41054105
"\
4106-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4106+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41074107
--emit=dep-info,link[..]",
41084108
).run();
41094109

41104110
p.root().join("target").rm_rf();
41114111
p.cargo("build -v --test=t1")
41124112
.with_stderr_contains(
41134113
"\
4114-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4114+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41154115
--emit=dep-info,link[..]",
41164116
).with_stderr_contains(
4117-
"[RUNNING] `rustc --crate-name t1 tests/t1.rs --emit=dep-info,link[..]",
4117+
"[RUNNING] `rustc --crate-name t1 tests/t1.rs --color never --emit=dep-info,link[..]",
41184118
).with_stderr_contains(
41194119
"\
4120-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4120+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41214121
--emit=dep-info,link[..]",
41224122
).run();
41234123

41244124
p.root().join("target").rm_rf();
41254125
p.cargo("build -v --bench=b1")
41264126
.with_stderr_contains(
41274127
"\
4128-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4128+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41294129
--emit=dep-info,link[..]",
41304130
).with_stderr_contains(
41314131
"\
4132-
[RUNNING] `rustc --crate-name b1 benches/b1.rs --emit=dep-info,link \
4132+
[RUNNING] `rustc --crate-name b1 benches/b1.rs --color never --emit=dep-info,link \
41334133
-C opt-level=3[..]",
41344134
).with_stderr_contains(
41354135
"\
4136-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4136+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41374137
--emit=dep-info,link[..]",
41384138
).run();
41394139
}
@@ -4144,15 +4144,15 @@ fn targets_selected_default() {
41444144
p.cargo("build -v")
41454145
// bin
41464146
.with_stderr_contains("\
4147-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4147+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41484148
--emit=dep-info,link[..]")
41494149
// bench
41504150
.with_stderr_does_not_contain("\
4151-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4151+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41524152
-C opt-level=3 --test [..]")
41534153
// unit test
41544154
.with_stderr_does_not_contain("\
4155-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4155+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41564156
-C debuginfo=2 --test [..]").run();
41574157
}
41584158

@@ -4162,15 +4162,15 @@ fn targets_selected_all() {
41624162
p.cargo("build -v --all-targets")
41634163
// bin
41644164
.with_stderr_contains("\
4165-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4165+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41664166
--emit=dep-info,link[..]")
41674167
// bench
41684168
.with_stderr_contains("\
4169-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4169+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41704170
-C opt-level=3 --test [..]")
41714171
// unit test
41724172
.with_stderr_contains("\
4173-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4173+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41744174
-C debuginfo=2 --test [..]").run();
41754175
}
41764176

@@ -4180,15 +4180,15 @@ fn all_targets_no_lib() {
41804180
p.cargo("build -v --all-targets")
41814181
// bin
41824182
.with_stderr_contains("\
4183-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4183+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41844184
--emit=dep-info,link[..]")
41854185
// bench
41864186
.with_stderr_contains("\
4187-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4187+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41884188
-C opt-level=3 --test [..]")
41894189
// unit test
41904190
.with_stderr_contains("\
4191-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4191+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41924192
-C debuginfo=2 --test [..]").run();
41934193
}
41944194

‎tests/testsuite/build_lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn build_lib_only() {
1111
.with_stderr(
1212
"\
1313
[COMPILING] foo v0.0.1 ([CWD])
14-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
14+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
1515
--emit=dep-info,link -C debuginfo=2 \
1616
-C metadata=[..] \
1717
--out-dir [..] \

‎tests/testsuite/build_script.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn custom_build_script_failed() {
3232
.with_stderr(
3333
"\
3434
[COMPILING] foo v0.5.0 ([CWD])
35-
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin [..]`
35+
[RUNNING] `rustc --crate-name build_script_build build.rs --color never --crate-type bin [..]`
3636
[RUNNING] `[..]/build-script-build`
3737
[ERROR] failed to run custom build command for `foo v0.5.0 ([CWD])`
3838
process didn't exit successfully: `[..]/build-script-build` (exit code: 101)",
@@ -955,19 +955,19 @@ fn build_cmd_with_a_build_cmd() {
955955
[COMPILING] a v0.5.0 ([CWD]/a)
956956
[RUNNING] `rustc [..] a/build.rs [..] --extern b=[..]`
957957
[RUNNING] `[..]/a-[..]/build-script-build`
958-
[RUNNING] `rustc --crate-name a [..]lib.rs --crate-type lib \
958+
[RUNNING] `rustc --crate-name a [..]lib.rs --color never --crate-type lib \
959959
--emit=dep-info,link -C debuginfo=2 \
960960
-C metadata=[..] \
961961
--out-dir [..]target/debug/deps \
962962
-L [..]target/debug/deps`
963963
[COMPILING] foo v0.5.0 ([CWD])
964-
[RUNNING] `rustc --crate-name build_script_build build.rs --crate-type bin \
964+
[RUNNING] `rustc --crate-name build_script_build build.rs --color never --crate-type bin \
965965
--emit=dep-info,link \
966966
-C debuginfo=2 -C metadata=[..] --out-dir [..] \
967967
-L [..]target/debug/deps \
968968
--extern a=[..]liba[..].rlib`
969969
[RUNNING] `[..]/foo-[..]/build-script-build`
970-
[RUNNING] `rustc --crate-name foo [..]lib.rs --crate-type lib \
970+
[RUNNING] `rustc --crate-name foo [..]lib.rs --color never --crate-type lib \
971971
--emit=dep-info,link -C debuginfo=2 \
972972
-C metadata=[..] \
973973
--out-dir [..] \

‎tests/testsuite/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ fn check_filters() {
521521
p.root().join("target").rm_rf();
522522
p.cargo("check --tests -v")
523523
.with_stderr_contains("[..] --crate-name foo src/lib.rs [..] --test [..]")
524-
.with_stderr_contains("[..] --crate-name foo src/lib.rs --crate-type lib [..]")
524+
.with_stderr_contains("[..] --crate-name foo src/lib.rs [..] --crate-type lib [..]")
525525
.with_stderr_contains("[..] --crate-name foo src/main.rs [..] --test [..]")
526526
.with_stderr_contains("[..]unused_unit_lib[..]")
527527
.with_stderr_contains("[..]unused_unit_bin[..]")

‎tests/testsuite/cross_compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ fn linker_and_ar() {
358358
.with_stderr_contains(&format!(
359359
"\
360360
[COMPILING] foo v0.5.0 ([CWD])
361-
[RUNNING] `rustc --crate-name foo src/foo.rs --crate-type bin \
361+
[RUNNING] `rustc --crate-name foo src/foo.rs --color never --crate-type bin \
362362
--emit=dep-info,link -C debuginfo=2 \
363363
-C metadata=[..] \
364364
--out-dir [CWD]/target/{target}/debug/deps \

‎tests/testsuite/profile_overrides.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,17 @@ fn profile_override_hierarchy() {
305305
p.cargo("build -v").masquerade_as_nightly_cargo().with_stderr_unordered("\
306306
[COMPILING] m3 [..]
307307
[COMPILING] dep [..]
308-
[RUNNING] `rustc --crate-name m3 m3/src/lib.rs --crate-type lib --emit=dep-info,link -C codegen-units=4 [..]
309-
[RUNNING] `rustc --crate-name dep [..]dep/src/lib.rs --crate-type lib --emit=dep-info,link -C codegen-units=3 [..]
310-
[RUNNING] `rustc --crate-name m3 m3/src/lib.rs --crate-type lib --emit=dep-info,link -C codegen-units=1 [..]
311-
[RUNNING] `rustc --crate-name build_script_build m1/build.rs --crate-type bin --emit=dep-info,link -C codegen-units=4 [..]
308+
[RUNNING] `rustc --crate-name m3 m3/src/lib.rs --color never --crate-type lib --emit=dep-info,link -C codegen-units=4 [..]
309+
[RUNNING] `rustc --crate-name dep [..]dep/src/lib.rs --color never --crate-type lib --emit=dep-info,link -C codegen-units=3 [..]
310+
[RUNNING] `rustc --crate-name m3 m3/src/lib.rs --color never --crate-type lib --emit=dep-info,link -C codegen-units=1 [..]
311+
[RUNNING] `rustc --crate-name build_script_build m1/build.rs --color never --crate-type bin --emit=dep-info,link -C codegen-units=4 [..]
312312
[COMPILING] m2 [..]
313-
[RUNNING] `rustc --crate-name build_script_build m2/build.rs --crate-type bin --emit=dep-info,link -C codegen-units=2 [..]
313+
[RUNNING] `rustc --crate-name build_script_build m2/build.rs --color never --crate-type bin --emit=dep-info,link -C codegen-units=2 [..]
314314
[RUNNING] `[..]/m1-[..]/build-script-build`
315315
[RUNNING] `[..]/m2-[..]/build-script-build`
316-
[RUNNING] `rustc --crate-name m2 m2/src/lib.rs --crate-type lib --emit=dep-info,link -C codegen-units=2 [..]
316+
[RUNNING] `rustc --crate-name m2 m2/src/lib.rs --color never --crate-type lib --emit=dep-info,link -C codegen-units=2 [..]
317317
[COMPILING] m1 [..]
318-
[RUNNING] `rustc --crate-name m1 m1/src/lib.rs --crate-type lib --emit=dep-info,link -C codegen-units=1 [..]
318+
[RUNNING] `rustc --crate-name m1 m1/src/lib.rs --color never --crate-type lib --emit=dep-info,link -C codegen-units=1 [..]
319319
[FINISHED] dev [unoptimized + debuginfo] [..]
320320
",
321321
)

0 commit comments

Comments
 (0)