Skip to content

Commit 6a9f094

Browse files
committed
Convert the testsuite to use the new -Zcheck-cfg flag and syntax
1 parent 43c193a commit 6a9f094

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

tests/testsuite/build.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6249,7 +6249,7 @@ fn check_cfg_features() {
62496249
.file("src/main.rs", "fn main() {}")
62506250
.build();
62516251

6252-
p.cargo("build -v -Z check-cfg-features")
6252+
p.cargo("build -v -Zcheck-cfg=features")
62536253
.masquerade_as_nightly_cargo()
62546254
.with_stderr(
62556255
"\
@@ -6290,7 +6290,7 @@ fn check_cfg_features_with_deps() {
62906290
.file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
62916291
.build();
62926292

6293-
p.cargo("build -v -Z check-cfg-features")
6293+
p.cargo("build -v -Zcheck-cfg=features")
62946294
.masquerade_as_nightly_cargo()
62956295
.with_stderr(
62966296
"\
@@ -6334,7 +6334,7 @@ fn check_cfg_features_with_opt_deps() {
63346334
.file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
63356335
.build();
63366336

6337-
p.cargo("build -v -Z check-cfg-features")
6337+
p.cargo("build -v -Zcheck-cfg=features")
63386338
.masquerade_as_nightly_cargo()
63396339
.with_stderr(
63406340
"\
@@ -6377,7 +6377,7 @@ fn check_cfg_features_with_namespaced_features() {
63776377
.file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
63786378
.build();
63796379

6380-
p.cargo("build -v -Z check-cfg-features")
6380+
p.cargo("build -v -Zcheck-cfg=features")
63816381
.masquerade_as_nightly_cargo()
63826382
.with_stderr(
63836383
"\
@@ -6402,7 +6402,7 @@ fn check_cfg_well_known_names() {
64026402
.file("src/main.rs", "fn main() {}")
64036403
.build();
64046404

6405-
p.cargo("build -v -Z check-cfg-well-known-names")
6405+
p.cargo("build -v -Zcheck-cfg=names")
64066406
.masquerade_as_nightly_cargo()
64076407
.with_stderr(
64086408
"\
@@ -6427,7 +6427,7 @@ fn check_cfg_well_known_values() {
64276427
.file("src/main.rs", "fn main() {}")
64286428
.build();
64296429

6430-
p.cargo("build -v -Z check-cfg-well-known-values")
6430+
p.cargo("build -v -Zcheck-cfg=values")
64316431
.masquerade_as_nightly_cargo()
64326432
.with_stderr(
64336433
"\
@@ -6463,7 +6463,7 @@ fn check_cfg_all() {
64636463
.file("src/main.rs", "fn main() {}")
64646464
.build();
64656465

6466-
p.cargo("build -v -Z check-cfg-features -Z check-cfg-well-known-names -Z check-cfg-well-known-values")
6466+
p.cargo("build -v -Zcheck-cfg=features,names,values")
64676467
.masquerade_as_nightly_cargo()
64686468
.with_stderr(
64696469
"\

tests/testsuite/check.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ fn check_cfg_features() {
10391039
.file("src/main.rs", "fn main() {}")
10401040
.build();
10411041

1042-
p.cargo("check -v -Z check-cfg-features")
1042+
p.cargo("check -v -Zcheck-cfg=features")
10431043
.masquerade_as_nightly_cargo()
10441044
.with_stderr(
10451045
"\
@@ -1064,7 +1064,7 @@ fn check_cfg_well_known_names() {
10641064
.file("src/main.rs", "fn main() {}")
10651065
.build();
10661066

1067-
p.cargo("check -v -Z check-cfg-well-known-names")
1067+
p.cargo("check -v -Zcheck-cfg=names")
10681068
.masquerade_as_nightly_cargo()
10691069
.with_stderr(
10701070
"\
@@ -1089,7 +1089,7 @@ fn check_cfg_well_known_values() {
10891089
.file("src/main.rs", "fn main() {}")
10901090
.build();
10911091

1092-
p.cargo("check -v -Z check-cfg-well-known-values")
1092+
p.cargo("check -v -Zcheck-cfg=values")
10931093
.masquerade_as_nightly_cargo()
10941094
.with_stderr(
10951095
"\

tests/testsuite/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2808,7 +2808,7 @@ fn doc_check_cfg_features() {
28082808
.file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
28092809
.build();
28102810

2811-
p.cargo("doc -v -Z check-cfg-features")
2811+
p.cargo("doc -v -Zcheck-cfg=features")
28122812
.masquerade_as_nightly_cargo()
28132813
.with_stderr(
28142814
"\

tests/testsuite/test.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4524,7 +4524,7 @@ fn check_cfg_features() {
45244524
.file("src/main.rs", "fn main() {}")
45254525
.build();
45264526

4527-
p.cargo("test -v -Z check-cfg-features")
4527+
p.cargo("test -v -Zcheck-cfg=features")
45284528
.masquerade_as_nightly_cargo()
45294529
.with_stderr(
45304530
"\
@@ -4562,7 +4562,7 @@ fn check_cfg_features_doc() {
45624562
.file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
45634563
.build();
45644564

4565-
p.cargo("test -v --doc -Z check-cfg-features")
4565+
p.cargo("test -v --doc -Zcheck-cfg=features")
45664566
.masquerade_as_nightly_cargo()
45674567
.with_stderr(
45684568
"\
@@ -4589,7 +4589,7 @@ fn check_cfg_well_known_names() {
45894589
.file("src/main.rs", "fn main() {}")
45904590
.build();
45914591

4592-
p.cargo("test -v -Z check-cfg-well-known-names")
4592+
p.cargo("test -v -Zcheck-cfg=names")
45934593
.masquerade_as_nightly_cargo()
45944594
.with_stderr(
45954595
"\
@@ -4615,7 +4615,7 @@ fn check_cfg_well_known_values() {
46154615
.file("src/main.rs", "fn main() {}")
46164616
.build();
46174617

4618-
p.cargo("test -v -Z check-cfg-well-known-values")
4618+
p.cargo("test -v -Zcheck-cfg=values")
46194619
.masquerade_as_nightly_cargo()
46204620
.with_stderr(
46214621
"\
@@ -4641,7 +4641,7 @@ fn check_cfg_well_known_names_doc() {
46414641
.file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
46424642
.build();
46434643

4644-
p.cargo("test -v --doc -Z check-cfg-well-known-names")
4644+
p.cargo("test -v --doc -Zcheck-cfg=names")
46454645
.masquerade_as_nightly_cargo()
46464646
.with_stderr(
46474647
"\
@@ -4668,7 +4668,7 @@ fn check_cfg_well_known_values_doc() {
46684668
.file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
46694669
.build();
46704670

4671-
p.cargo("test -v --doc -Z check-cfg-well-known-values")
4671+
p.cargo("test -v --doc -Zcheck-cfg=values")
46724672
.masquerade_as_nightly_cargo()
46734673
.with_stderr(
46744674
"\

0 commit comments

Comments
 (0)