diff options
| author | bors <bors@rust-lang.org> | 2018-07-29 11:27:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-29 11:27:48 +0000 |
| commit | 2a9dc245c60ab4478b3bc4670aaad4b39e646366 (patch) | |
| tree | 7e0d6f30d6845ed7a40d92e2644af7fe8fcf9f51 /src/bootstrap | |
| parent | 023fd7e74a9eb5bafcb75fcbe69b7110e9de4492 (diff) | |
| parent | cab21f12d5a374978e865d6e3062024d4ba2d83a (diff) | |
| download | rust-2a9dc245c60ab4478b3bc4670aaad4b39e646366.tar.gz rust-2a9dc245c60ab4478b3bc4670aaad4b39e646366.zip | |
Auto merge of #52755 - kennytm:update-rustfmt, r=nrc
Update rustfmt and RLS
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 7c69197885c..24a1dbbde66 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -290,6 +290,13 @@ impl Step for Rls { "src/tools/rls", SourceType::Submodule); + // Copy `src/tools/rls/test_data` to a writable drive. + let test_workspace_path = builder.out.join("rls-test-data"); + let test_data_path = test_workspace_path.join("test_data"); + builder.create_dir(&test_data_path); + builder.cp_r(&builder.src.join("src/tools/rls/test_data"), &test_data_path); + cargo.env("RLS_TEST_WORKSPACE_DIR", test_workspace_path); + builder.add_rustc_lib_path(compiler, &mut cargo); if try_run(builder, &mut cargo) { |