Skip to content

Commit

Permalink
Auto merge of #13072 - belovdv:jobserver-remove-env-var, r=weihanglo
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
bors committed Nov 29, 2023
2 parents bec67ed + 6b86f93 commit d5d9c35
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tests/testsuite/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit d5d9c35

Please sign in to comment.