mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only run proc-macro-srv tests for now (after discussion with @Veykril, @jyn514, and @lnicola)

Browse Source
This commit is contained in:
Amos Wenger 2022-07-24 21:04:56 +02:00
parent ee584c19c7
commit fa0037a5d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bootstrap/test.rs
View File

@ -379,19 +379,22 @@ impl Step for RustAnalyzer {
builder.ensure(tool::RustAnalyzer { compiler, target: self.host }).expect("in-tree tool"); 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( let mut cargo = tool::prepare_tool_cargo(
builder, builder,
compiler, compiler,
Mode::ToolStd, Mode::ToolStd,
host, host,
"test", "test",
path, crate_path,
SourceType::InTree, 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. // needed by rust-analyzer to find its own text fixtures, cf.
// https://github.com/rust-analyzer/expect-test/issues/33 // https://github.com/rust-analyzer/expect-test/issues/33
cargo.env("CARGO_WORKSPACE_DIR", &dir); cargo.env("CARGO_WORKSPACE_DIR", &dir);