Auto merge of #48938 - alexcrichton:no-leak-makeflags, r=kennytm
test: Forcibly remove MAKEFLAGS in compiletest When executing run-make tests we run a risk of leaking the `MAKEFLAGS` environment variable if `./x.py` itself was called from `make` (aka `make check -j3` as the OSX bots do). We may then leak accidentally fds into the child process and trick it into thinking it's got a jobserver! Hopefully addresses [this] spurious failure [this]: https://github.com/rust-lang/rust/pull/48295#issuecomment-372134717
This commit is contained in:
commit
4eea3597f2
1 changed files with 8 additions and 1 deletions
|
@ -2412,7 +2412,14 @@ impl<'test> TestCx<'test> {
|
|||
.env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
|
||||
.env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path))
|
||||
.env("LLVM_COMPONENTS", &self.config.llvm_components)
|
||||
.env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags);
|
||||
.env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags)
|
||||
|
||||
// We for sure don't want these tests to run in parallel, so make
|
||||
// sure they don't have access to these vars if we we run via `make`
|
||||
// at the top level
|
||||
.env_remove("MAKEFLAGS")
|
||||
.env_remove("MFLAGS")
|
||||
.env_remove("CARGO_MAKEFLAGS");
|
||||
|
||||
if let Some(ref linker) = self.config.linker {
|
||||
cmd.env("RUSTC_LINKER", linker);
|
||||
|
|
Loading…
Reference in a new issue