File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 24
24
runs-on : ${{ matrix.os }}
25
25
env :
26
26
CC : deny_c
27
+ RUSTC_BOOTSTRAP : 1
27
28
28
29
strategy :
29
30
fail-fast : false
@@ -50,15 +51,15 @@ jobs:
50
51
run : sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
51
52
52
53
- name : Compile (tests)
53
- run : cargo test --no-run --locked
54
+ run : cargo test --no-run --locked --features sysroot-abi
54
55
55
56
# It's faster to `test` before `build` ¯\_(ツ)_/¯
56
57
- name : Compile (rust-analyzer)
57
58
if : matrix.os == 'ubuntu-latest'
58
- run : cargo build --quiet
59
+ run : cargo build --quiet --features sysroot-abi
59
60
60
61
- name : Test
61
- run : cargo test -- --nocapture --quiet
62
+ run : cargo test --features sysroot-abi -- --nocapture --quiet
62
63
63
64
- name : Run analysis-stats on rust-analyzer
64
65
if : matrix.os == 'ubuntu-latest'
Original file line number Diff line number Diff line change @@ -95,8 +95,9 @@ mbe.workspace = true
95
95
[features ]
96
96
jemalloc = [" jemallocator" , " profile/jemalloc" ]
97
97
force-always-assert = [" always-assert/force" ]
98
+ sysroot-abi = [" proc-macro-srv-cli/sysroot-abi" ]
98
99
in-rust-tree = [
99
- " proc-macro-srv-cli/ sysroot-abi" ,
100
+ " sysroot-abi" ,
100
101
" ide/in-rust-tree" ,
101
102
" syntax/in-rust-tree" ,
102
103
]
Original file line number Diff line number Diff line change @@ -818,8 +818,7 @@ fn main() {
818
818
}
819
819
820
820
#[ 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" ) ]
823
822
fn resolve_proc_macro ( ) {
824
823
use expect_test:: expect;
825
824
if skip_slow_tests ( ) {
You can’t perform that action at this time.
0 commit comments