Skip to content

Commit

Permalink
Only run proc-macro-srv tests for now (after discussion with @Veykril,
Browse files Browse the repository at this point in the history
  • Loading branch information
fasterthanlime committed Jul 24, 2022
1 parent ee584c1 commit fa0037a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,19 +379,22 @@ impl Step for RustAnalyzer {

builder.ensure(tool::RustAnalyzer { compiler, target: self.host }).expect("in-tree tool");

let path = "src/tools/rust-analyzer";
let workspace_path = "src/tools/rust-analyzer";
// until the whole RA test suite runs on `i686`, we only run
// `proc-macro-srv` tests
let crate_path = "src/tools/rust-analyzer/crates/proc-macro-srv";
let mut cargo = tool::prepare_tool_cargo(
builder,
compiler,
Mode::ToolStd,
host,
"test",
path,
crate_path,
SourceType::InTree,
&["rust-analyzer/in-rust-tree".to_owned()],
&["sysroot-abi".to_owned()],
);

let dir = builder.src.join(path);
let dir = builder.src.join(workspace_path);
// needed by rust-analyzer to find its own text fixtures, cf.
// https://github.com/rust-analyzer/expect-test/issues/33
cargo.env("CARGO_WORKSPACE_DIR", &dir);
Expand Down

0 comments on commit fa0037a

Please sign in to comment.