Convert the testsuite to use the new -Zcheck-cfg flag and syntax

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index 67ef5db4f36cbfa7f604e5078ed6a178333449ac..e6268ac7a622808b923f0ac637fcb878ed0c0ca1 100644 (file)
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -6249,7 +6249,7 @@ fn check_cfg_features() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-features")
+    p.cargo("build -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6290,7 +6290,7 @@ fn check_cfg_features_with_deps() {
         .file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-features")
+    p.cargo("build -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6334,7 +6334,7 @@ fn check_cfg_features_with_opt_deps() {
         .file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-features")
+    p.cargo("build -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6377,7 +6377,7 @@ fn check_cfg_features_with_namespaced_features() {
         .file("bar/src/lib.rs", "#[allow(dead_code)] fn bar() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-features")
+    p.cargo("build -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6402,7 +6402,7 @@ fn check_cfg_well_known_names() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-well-known-names")
+    p.cargo("build -v -Zcheck-cfg=names")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6427,7 +6427,7 @@ fn check_cfg_well_known_values() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-well-known-values")
+    p.cargo("build -v -Zcheck-cfg=values")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -6463,7 +6463,7 @@ fn check_cfg_all() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("build -v -Z check-cfg-features -Z check-cfg-well-known-names -Z check-cfg-well-known-values")
+    p.cargo("build -v -Zcheck-cfg=features,names,values")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\

diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs
index c8c302eb026116ab1afbd09ec7d126c53867ded9..eda525670b45733b229588fd570ba0c523a31998 100644 (file)
--- a/tests/testsuite/check.rs
+++ b/tests/testsuite/check.rs
@@ -1039,7 +1039,7 @@ fn check_cfg_features() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("check -v -Z check-cfg-features")
+    p.cargo("check -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -1064,7 +1064,7 @@ fn check_cfg_well_known_names() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("check -v -Z check-cfg-well-known-names")
+    p.cargo("check -v -Zcheck-cfg=names")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -1089,7 +1089,7 @@ fn check_cfg_well_known_values() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("check -v -Z check-cfg-well-known-values")
+    p.cargo("check -v -Zcheck-cfg=values")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\

diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs
index a5d637d3db1800d0509cd32be7d94a0ffc59adf6..82125e6e4eb80205d07d1b7860f21edd13540d7e 100644 (file)
--- a/tests/testsuite/doc.rs
+++ b/tests/testsuite/doc.rs
@@ -2808,7 +2808,7 @@ fn doc_check_cfg_features() {
         .file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
         .build();
 
-    p.cargo("doc -v -Z check-cfg-features")
+    p.cargo("doc -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\

diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs
index 4c1dc880ba58a7f877c698aa1112e65284e2e65a..b304b706addb993360bc453e8c00b8e9134ef4ff 100644 (file)
--- a/tests/testsuite/test.rs
+++ b/tests/testsuite/test.rs
@@ -4524,7 +4524,7 @@ fn check_cfg_features() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("test -v -Z check-cfg-features")
+    p.cargo("test -v -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -4562,7 +4562,7 @@ fn check_cfg_features_doc() {
         .file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
         .build();
 
-    p.cargo("test -v --doc -Z check-cfg-features")
+    p.cargo("test -v --doc -Zcheck-cfg=features")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -4589,7 +4589,7 @@ fn check_cfg_well_known_names() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("test -v -Z check-cfg-well-known-names")
+    p.cargo("test -v -Zcheck-cfg=names")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -4615,7 +4615,7 @@ fn check_cfg_well_known_values() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    p.cargo("test -v -Z check-cfg-well-known-values")
+    p.cargo("test -v -Zcheck-cfg=values")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -4641,7 +4641,7 @@ fn check_cfg_well_known_names_doc() {
         .file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
         .build();
 
-    p.cargo("test -v --doc -Z check-cfg-well-known-names")
+    p.cargo("test -v --doc -Zcheck-cfg=names")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
@@ -4668,7 +4668,7 @@ fn check_cfg_well_known_values_doc() {
         .file("src/lib.rs", "#[allow(dead_code)] fn foo() {}")
         .build();
 
-    p.cargo("test -v --doc -Z check-cfg-well-known-values")
+    p.cargo("test -v --doc -Zcheck-cfg=values")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\