Auto merge of #13072 - belovdv:jobserver-remove-env-var, r=weihanglo

bors · bors · commit d5d9c35e5fee · 2023-11-29T12:57:11.000Z
remove jobserver env var in some tests This PR makes cargo compatible with [rust-lang/rust#113730](rust-lang/rust#113730). Linked [comment](rust-lang/rust#113730 (comment)). Problem to be fixed: shim for cargo fix spawns rustc with make environment variable inherited, which points to closed jobserver. r? `@weihanglo`
diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
@@ -110,6 +110,7 @@ fn rustc_shim_for_cargo_fix() -> Project {
                     }
                     let status = Command::new("rustc")
                         .args(env::args().skip(1))
+                        .env_remove("CARGO_MAKEFLAGS")
                         .status()
                         .expect("failed to run rustc");
                     process::exit(status.code().unwrap_or(2));

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ fn rustc_shim_for_cargo_fix() -> Project {`
`110`	`110`	`}`
`111`	`111`	`let status = Command::new("rustc")`
`112`	`112`	`.args(env::args().skip(1))`
	`113`	`+ .env_remove("CARGO_MAKEFLAGS")`
`113`	`114`	`.status()`
`114`	`115`	`.expect("failed to run rustc");`
`115`	`116`	`process::exit(status.code().unwrap_or(2));`