test(cfg): parse rustc --print=target-spec-json

Author: harmou01

tests/testsuite/artifact_dep.rs

@@ -149,7 +149,7 @@ fn check_with_invalid_target_triple() {
 [ERROR] failed to run `rustc` to learn about target-specific information
 
 Caused by:
-  process didn't exit successfully: `rustc - --crate-name ___ --print=file-names --target unknown-target-triple [..]` ([EXIT_STATUS]: 1)
+  process didn't exit successfully: `rustc - --crate-name ___ -Zunstable-options --print=file-names --target unknown-target-triple [..]` ([EXIT_STATUS]: 1)
   --- stderr
   [ERROR] Error loading target specification: Could not find specification for target "unknown-target-triple". Run `rustc --print target-list` for a list of built-in targets
 

tests/testsuite/bad_config.rs

@@ -425,7 +425,7 @@ fn bad_crate_type() {
 [ERROR] failed to run `rustc` to learn about crate-type bad_type information
 
 Caused by:
-  process didn't exit successfully: `rustc - --crate-name ___ --print=file-names --crate-type bad_type` ([EXIT_STATUS]: 1)
+  process didn't exit successfully: `rustc - --crate-name ___ -Zunstable-options --print=file-names --crate-type bad_type` ([EXIT_STATUS]: 1)
   --- stderr
   [ERROR] unknown crate type: `bad_type`
 

tests/testsuite/build.rs

@@ -5199,7 +5199,7 @@ fn rustc_wrapper_queries() {
         .env("RUSTC_WRAPPER", &wrapper)
         .with_stderr_contains("[..]running [..]rustc-echo-wrapper[EXE] rustc -vV[..]")
         .with_stderr_contains(
-            "[..]running [..]rustc-echo-wrapper[EXE] rustc - --crate-name ___ --print[..]",
+            "[..]running [..]rustc-echo-wrapper[EXE] rustc - --crate-name ___ -Zunstable-options --print[..]",
         )
         .run();
     p.build_dir().rm_rf();
@@ -5208,7 +5208,7 @@ fn rustc_wrapper_queries() {
         .env("RUSTC_WORKSPACE_WRAPPER", &wrapper)
         .with_stderr_contains("[..]running [..]rustc-echo-wrapper[EXE] rustc -vV[..]")
         .with_stderr_contains(
-            "[..]running [..]rustc-echo-wrapper[EXE] rustc - --crate-name ___ --print[..]",
+            "[..]running [..]rustc-echo-wrapper[EXE] rustc - --crate-name ___ -Zunstable-options --print[..]",
         )
         .run();
 }

tests/testsuite/cfg.rs

@@ -387,6 +387,17 @@ fn bad_cfg_discovery() {
                     }
                 };
 
+                if mode == "no-target-spec-json" {
+                    return;
+                }
+                loop {
+                    let line = lines.next().unwrap();
+                    println!("{line}");
+                    if line == "}" {
+                        break;
+                    }
+                }
+
                 if mode != "bad-cfg" {
                     panic!("unexpected");
                 }
@@ -471,10 +482,34 @@ command was: `[..]compiler[..]--crate-type [..]`
 
     p.cargo("check")
         .env("RUSTC", &funky_rustc)
-        .env("FUNKY_MODE", "bad-cfg")
+        .env("FUNKY_MODE", "no-target-spec-json")
         .with_status(101)
         .with_stderr(
             "\
+[ERROR] output of --print=target-spec-json missing when learning about target-specific information from rustc
+command was: `[..]compiler[..]--crate-type [..]`
+
+--- stdout
+[..]___[..]
+[..]___[..]
+[..]___[..]
+[..]___[..]
+[..]___[..]
+[..]___[..]
+[..]
+[..]
+___
+
+",
+        )
+        .run();
+
+    p.cargo("check")
+        .env("RUSTC", &funky_rustc)
+        .env("FUNKY_MODE", "bad-cfg")
+        .with_status(101)
+        .with_stderr_contains(
+            "\
 [ERROR] failed to parse the cfg from `rustc --print=cfg`, got:
 [..]___[..]
 [..]___[..]
@@ -483,8 +518,13 @@ command was: `[..]compiler[..]--crate-type [..]`
 [..]___[..]
 [..]___[..]
 [..]
-[..],[..]
+[..]
 ___
+{
+",
+        )
+        .with_stderr_contains(
+            "\
 123