Skip to content

Commit afe52d2

Browse files
committed
Run proc-macro-srv tests on rust-lang/rust-analyzer
1 parent 7498ec7 commit afe52d2

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
env:
2626
CC: deny_c
27+
RUSTC_BOOTSTRAP: 1
2728

2829
strategy:
2930
fail-fast: false
@@ -50,15 +51,15 @@ jobs:
5051
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
5152

5253
- name: Compile (tests)
53-
run: cargo test --no-run --locked
54+
run: cargo test --no-run --locked --features sysroot-abi
5455

5556
# It's faster to `test` before `build` ¯\_(ツ)_/¯
5657
- name: Compile (rust-analyzer)
5758
if: matrix.os == 'ubuntu-latest'
58-
run: cargo build --quiet
59+
run: cargo build --quiet --features sysroot-abi
5960

6061
- name: Test
61-
run: cargo test -- --nocapture --quiet
62+
run: cargo test --features sysroot-abi -- --nocapture --quiet
6263

6364
- name: Run analysis-stats on rust-analyzer
6465
if: matrix.os == 'ubuntu-latest'

crates/rust-analyzer/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ mbe.workspace = true
9595
[features]
9696
jemalloc = ["jemallocator", "profile/jemalloc"]
9797
force-always-assert = ["always-assert/force"]
98+
sysroot-abi = ["proc-macro-srv-cli/sysroot-abi"]
9899
in-rust-tree = [
99-
"proc-macro-srv-cli/sysroot-abi",
100+
"sysroot-abi",
100101
"ide/in-rust-tree",
101102
"syntax/in-rust-tree",
102103
]

crates/rust-analyzer/tests/slow-tests/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,8 +818,7 @@ fn main() {
818818
}
819819

820820
#[test]
821-
// FIXME: Re-enable once we can run proc-macro tests on rust-lang/rust-analyzer again
822-
#[cfg(any())]
821+
#[cfg(feature = "sysroot-abi")]
823822
fn resolve_proc_macro() {
824823
use expect_test::expect;
825824
if skip_slow_tests() {

0 commit comments

Comments
 (0)