diff options
| author | bors <bors@rust-lang.org> | 2018-05-06 22:29:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-06 22:29:01 +0000 |
| commit | 700165d7aeba7fbba79bcc322e010137ae70b46a (patch) | |
| tree | 45cf222649688f1d200a21d1e42038848b238788 /src/bootstrap | |
| parent | 428ea5f6b9e7c6e5ee3294fe9f105e77e89ab407 (diff) | |
| parent | df97dd1d05c1b1265b0ce5b929bc86f9780e821b (diff) | |
| download | rust-700165d7aeba7fbba79bcc322e010137ae70b46a.tar.gz rust-700165d7aeba7fbba79bcc322e010137ae70b46a.zip | |
Auto merge of #50468 - nrc:test-rustfmt, r=alexcrichton
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
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index cbb952bab61..2865801742f 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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); |