diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2018-05-06 08:27:48 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2018-05-06 08:39:37 +1200 |
| commit | df97dd1d05c1b1265b0ce5b929bc86f9780e821b (patch) | |
| tree | 6bbef93cdce0f3509057010ba1bc7e3f04bb7f2f | |
| parent | e78c51adc2a51fbec1d254d2ba8d8718688c7429 (diff) | |
| download | rust-df97dd1d05c1b1265b0ce5b929bc86f9780e821b.tar.gz rust-df97dd1d05c1b1265b0ce5b929bc86f9780e821b.zip | |
Pass a test directory to rustfmt
| -rw-r--r-- | src/bootstrap/test.rs | 3 | ||||
| m--------- | src/tools/rustfmt | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index e8c40dfdb0a..0e90a762fb4 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); diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject b6cd17f28ae314f2484ff05d3ce57652d51c5e8 +Subproject 0f8029f251b569a010cb5cfc5a8bff8bf3c949a |