Run main rust-analyzer tests in rust-lang/rust CI #147372

jieyouxu · 2025-10-05T11:28:27Z

Part of #147370.
MCP: rust-lang/compiler-team#923

This PR prepares rust-analyzer crates with in-rust-tree cargo featues where needed, and and updates bootstrap to run the main rust-analyzer tests in rust-lang/rust CI, not just the proc-macro-srv crate tests.

This supersedes the earlier attempt at #136779. I was honestly expecting more failures in this PR, but looking back at the previous attempt, that makes sense because we no longer run i686-mingw (32-bit windows-gnu) which had a bunch of these failures. In the earlier attempt I also disabled the i686-mingw-related failures for i686-msvc since I didn't feel like digging into 32-bit msvc at the time. Try results from this PR shows that it's most likely limited to 32-bit windows-gnu specifically.

`rust-analyzer` test remarks

I actually had to remove the CARGO_WORKSPACE_DIR expect-test-hack in order for expect-test to be able to find the test expectation HTML files (for syntax_highlighting tests in ide). When I added the hack, ironically, it made expect-test unable to find the expectation files. I think this was because previously the path was of the proc-macro-srv crate specifically, now we point to the root r-a workspace?
The cfg-related differences on aarch64-apple-darwin might've been fixed? I can't tell, but we don't seem to be observing the differences now.
I'm not sure why config::{generate_config_documentation, generate_package_json_config} no longer fails. Perhaps they were fixed to no longer try to write to source directory?

Review remarks

Commit 1 updates r-a crates that are involved in tests needing artifacts from rustc_private compiler crates to use the in-rust-tree cargo feature. I briefly tried to use a plain --cfg=in_rust_tree, but quickly realized it was very hacky, and needed invasive bootstrap changes. The cargo feature approach seems most "natural"/well-supported to both bootstrap and cargo.
Commit 2 updates bootstrap to not only run the proc-macro-srv tests, but the whole r-a tests.

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-1
try-job: x86_64-msvc-1
try-job: aarch64-msvc-1

jieyouxu · 2025-10-05T11:28:37Z

@bors try

[DO NOT MERGE] Run main rust-analyzer tests try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-1 try-job: x86_64-msvc-1 try-job: aarch64-msvc-1

jieyouxu · 2025-10-05T13:54:31Z

Huh.
@bors try

[DO NOT MERGE] Run main rust-analyzer tests try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-1 try-job: x86_64-msvc-1 try-job: aarch64-msvc-1

rust-bors · 2025-10-05T17:08:47Z

☀️ Try build successful (CI)
Build commit: 867471f (867471f2085391d229c964771d52579ba984c324, parent: e2c96cc06bdbdbc6f59c7551194d6a742260d6ff)

Kivooeo · 2025-10-05T17:13:41Z

I'd consider this a win?

… r=Kobzol bootstrap: don't build book redirect pages during dry-run/test Currently, `./x test bootstrap` does not automatically transitively checkout submodules needed to pass all involved test steps. Apparently one place where bootstrap's self-test can choke on locally is trying to build book redirect pages without the book submodules checked out. This change is orthogonal to making bootstrap checking out required submodules for self-tests, and IMO is beneficial regardless since IMO we should not be building these redirect pages during test/dry-run _anyway_. This was blocking me trying to rebless bootstrap self-tests for rust-lang#147372. cf. [#t-infra/bootstrap > Bootstrap self-tests @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Bootstrap.20self-tests/near/543157194). r? `@Kobzol` (or bootstrap)

Rollup merge of #147374 - jieyouxu:bootstrap-redirect-pages, r=Kobzol bootstrap: don't build book redirect pages during dry-run/test Currently, `./x test bootstrap` does not automatically transitively checkout submodules needed to pass all involved test steps. Apparently one place where bootstrap's self-test can choke on locally is trying to build book redirect pages without the book submodules checked out. This change is orthogonal to making bootstrap checking out required submodules for self-tests, and IMO is beneficial regardless since IMO we should not be building these redirect pages during test/dry-run _anyway_. This was blocking me trying to rebless bootstrap self-tests for #147372. cf. [#t-infra/bootstrap > Bootstrap self-tests @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Bootstrap.20self-tests/near/543157194). r? `@Kobzol` (or bootstrap)

jieyouxu · 2025-10-06T09:00:54Z

src/bootstrap/src/core/build_steps/test.rs

+ // FIXME: teach rust-analyzer to use `RUST_ANALYZER_TEST_DIR` for its test output root
+ // directory. In the rust-lang/rust CI, we separate checkout directory vs build directory,
+ // where the checkout directory is read-only whereas build directory (including test output
+ // directories) is writable.
+ let dir = testdir(builder, target);
+ t!(fs::create_dir_all(&dir));
+ cargo.env("RUST_ANALYZER_TEST_DIR", dir);


Remark: I added this mostly for review discussion, remove before merge if r-a wants to use another approach or don't need this.

Actually, let me remove this, this was an intermediate thing. Tracking this as a follow-up in #147370.

jieyouxu · 2025-10-06T09:02:11Z

r? @Kobzol (for bootstrap side)
r? @Veykril (for r-a side)

FYI @rust-lang/rust-analyzer

rustbot · 2025-10-06T09:02:19Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Kobzol

The changes look fine, but I'm not sure if this doesn't require an MCP. We should also check the CI durations.

View changes since this review

src/bootstrap/src/core/build_steps/test.rs

jieyouxu · 2025-10-06T09:18:58Z

The changes look fine, but I'm not sure if this doesn't require an MCP.

I will open one if just for the visibility, even if in the end we find that it's not technically needed.

rustbot · 2025-11-02T09:02:59Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

jieyouxu · 2025-11-02T09:07:46Z

The MCP rust-lang/compiler-team#923 is accepted. Pushed a rebase, this is now ready for re-review. I didn't write additional docs, because this is wired up like the usual $tool tests (i.e. ./x test src/tools/rust-analyzer does now the "expected" thing of running full r-a tests, instead of the proc-macro-srv subset).

@rustbot label: -S-waiting-on-MCP
@rustbot ready

src/tools/rust-analyzer/crates/ide-db/Cargo.toml

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

jieyouxu mentioned this pull request Oct 5, 2025

bootstrap: don't build book redirect pages during dry-run/test #147374

Merged

jieyouxu force-pushed the rust-analyzer-main-tests branch from 9f7d76f to 43d7f3e Compare October 5, 2025 12:14

This comment was marked as outdated.

Sign in to view

jieyouxu force-pushed the rust-analyzer-main-tests branch from 43d7f3e to bcc2aae Compare October 5, 2025 12:22

jieyouxu mentioned this pull request Oct 5, 2025

Tracking issue for enabling main rust-analyzer tests in r-l/r CI #147370

Open

5 tasks

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

jieyouxu force-pushed the rust-analyzer-main-tests branch 2 times, most recently from c72221d to 0af3c68 Compare October 6, 2025 08:45

jieyouxu commented Oct 6, 2025

View reviewed changes

rustbot assigned Kobzol and Veykril Oct 6, 2025

jieyouxu marked this pull request as ready for review October 6, 2025 09:02

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 6, 2025

jieyouxu changed the title ~~[DO NOT MERGE] Run main rust-analyzer tests~~ Run main rust-analyzer tests in rust-lang/rust CI Oct 6, 2025

jieyouxu force-pushed the rust-analyzer-main-tests branch from 0af3c68 to bbfdd24 Compare October 6, 2025 09:04

jieyouxu mentioned this pull request Oct 6, 2025

[DO NOT MERGE] ./x test rust-analyzer #136779

Closed

Veykril approved these changes Oct 6, 2025

View reviewed changes

Kobzol reviewed Oct 6, 2025

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

jieyouxu force-pushed the rust-analyzer-main-tests branch from bbfdd24 to bb43aca Compare October 6, 2025 09:23

jieyouxu added the needs-mcp This change is large enough that it needs a major change proposal before starting work. label Oct 6, 2025

jieyouxu mentioned this pull request Oct 6, 2025

Run main rust-analyzer tests in rust-lang/rust CI rust-lang/compiler-team#923

Closed

3 tasks

jieyouxu force-pushed the rust-analyzer-main-tests branch from bb43aca to 4762ea6 Compare November 2, 2025 09:02

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-MCP Status: PR has a compiler MCP and is waiting for the compiler MCP to complete. labels Nov 2, 2025

jieyouxu commented Nov 2, 2025

View reviewed changes

src/tools/rust-analyzer/crates/ide-db/Cargo.toml Outdated Show resolved Hide resolved

jieyouxu added 2 commits November 2, 2025 17:10

rust-analyzer: prep crates for testing against in-tree rustc_private

c24cecf

bootstrap: run full rust-analyzer tests

f3edba7

jieyouxu force-pushed the rust-analyzer-main-tests branch from 4762ea6 to f3edba7 Compare November 2, 2025 09:10

jieyouxu mentioned this pull request Nov 2, 2025

Tracking issue for MCP 923: Run main rust-analyzer tests in rust-lang/rust CI #148372

Open

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Run main rust-analyzer tests in rust-lang/rust CI #147372

Run main rust-analyzer tests in rust-lang/rust CI #147372

jieyouxu commented Oct 5, 2025 •

edited

Loading

jieyouxu commented Oct 5, 2025

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

jieyouxu commented Oct 5, 2025

This comment has been minimized.

rust-bors bot commented Oct 5, 2025

Kivooeo commented Oct 5, 2025

This comment was marked as resolved.

jieyouxu Oct 6, 2025 •

edited

Loading

jieyouxu Oct 6, 2025 •

edited

Loading

jieyouxu commented Oct 6, 2025

rustbot commented Oct 6, 2025

Kobzol left a comment •

edited by rustbot

Loading

Uh oh!

Uh oh!

jieyouxu commented Oct 6, 2025

rustbot commented Nov 2, 2025

jieyouxu commented Nov 2, 2025

Uh oh!

Labels

6 participants

Run main rust-analyzer tests in rust-lang/rust CI #147372

Are you sure you want to change the base?

Run main rust-analyzer tests in rust-lang/rust CI #147372

Conversation

jieyouxu commented Oct 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

rust-analyzer test remarks

Review remarks

jieyouxu commented Oct 5, 2025

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

jieyouxu commented Oct 5, 2025

This comment has been minimized.

rust-bors bot commented Oct 5, 2025

Kivooeo commented Oct 5, 2025

This comment was marked as resolved.

jieyouxu Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

jieyouxu Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

jieyouxu commented Oct 6, 2025

rustbot commented Oct 6, 2025

Kobzol left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jieyouxu commented Oct 6, 2025

rustbot commented Nov 2, 2025

jieyouxu commented Nov 2, 2025

Uh oh!

Labels

6 participants

jieyouxu commented Oct 5, 2025 •

edited

Loading

`rust-analyzer` test remarks

jieyouxu Oct 6, 2025 •

edited

Loading

jieyouxu Oct 6, 2025 •

edited

Loading

Kobzol left a comment •

edited by rustbot

Loading