user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #50468 - nrc:test-rustfmt, r=alexcrichton

Browse source 
Pass a test directory to rustfmt

Another attempt to fix the rustfmt tests. `RUSTFMT_TEST_DIR` is consumed by Rustfmt in the latext commit (thus the Rustfmt update) because we need a place to create temp files that won't be read-only.

r? @alexcrichton
This commit is contained in:
bors 2018-05-06 22:29:01 +00:00
commit 700165d7ae
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/test.rs
View file

@ -313,6 +313,9 @@ impl Step for Rustfmt {
// Don't build tests dynamically, just a pain to work with
cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
let dir = testdir(builder, compiler.host);
t!(fs::create_dir_all(&dir));
cargo.env("RUSTFMT_TEST_DIR", dir);
builder.add_rustc_lib_path(compiler, &mut cargo);

2
src/tools/rustfmt

@ -1 +1 @@
Subproject commit b6cd17f28ae314f2484ff05d3ce57652d51c5e85
Subproject commit 0f8029f251b569a010cb5cfc5a8bff8bf3c949ac