diff options
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 7 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index b6f3f97e627..2edc78ebaa9 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -283,13 +283,6 @@ impl Step for 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); cargo.arg("--") .args(builder.config.cmd.test_args()); diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 1a5a8740499..7782351a552 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -140,7 +140,7 @@ impl Step for ToolBuild { }); if is_expected && !duplicates.is_empty() { - println!("duplicate artfacts found when compiling a tool, this \ + println!("duplicate artifacts found when compiling a tool, this \ typically means that something was recompiled because \ a transitive dependency has different features activated \ than in a previous build:\n"); |