Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #13286 - Veykril:proc-macro-srv-tests, r=Veykril
Don't run proc-macro-srv tests on the rust-analyzer repo
proc-macro ABI breakage still affects the tests when a new stable version releases. Ideally we'd still be able to run the tests on the rust-analyzer repo without having to update the proc-macro ABI, but for now just to unblock CI we will ignore them here, as they are still run in upstream.
| -rw-r--r-- | crates/proc-macro-srv/src/abis/abi_sysroot/mod.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/abis/mod.rs | 11 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/lib.rs | 9 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/tests/mod.rs | 11 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/tests/utils.rs | 12 | ||||
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/main.rs | 4 |
6 files changed, 26 insertions, 23 deletions
diff --git a/crates/proc-macro-srv/src/abis/abi_sysroot/mod.rs b/crates/proc-macro-srv/src/abis/abi_sysroot/mod.rs index 44712f4191..243972b049 100644 --- a/crates/proc-macro-srv/src/abis/abi_sysroot/mod.rs +++ b/crates/proc-macro-srv/src/abis/abi_sysroot/mod.rs @@ -11,6 +11,8 @@ use proc_macro_api::ProcMacroKind; use super::PanicMessage; +pub use ra_server::TokenStream; + pub(crate) struct Abi { exported_macros: Vec<proc_macro::bridge::client::ProcMacro>, } diff --git a/crates/proc-macro-srv/src/abis/mod.rs b/crates/proc-macro-srv/src/abis/mod.rs index f7d3a30919..2f854bc159 100644 --- a/crates/proc-macro-srv/src/abis/mod.rs +++ b/crates/proc-macro-srv/src/abis/mod.rs @@ -32,8 +32,8 @@ mod abi_sysroot; include!(concat!(env!("OUT_DIR"), "/rustc_version.rs")); // Used by `test/utils.rs` -#[cfg(test)] -pub(crate) use abi_1_63::TokenStream as TestTokenStream; +#[cfg(all(test, feature = "sysroot-abi"))] +pub(crate) use abi_sysroot::TokenStream as TestTokenStream; use super::dylib::LoadProcMacroDylibError; pub(crate) use abi_1_58::Abi as Abi_1_58; @@ -144,3 +144,10 @@ impl Abi { } } } + +#[test] +fn test_version_check() { + let path = paths::AbsPathBuf::assert(crate::proc_macro_test_dylib_path()); + let info = proc_macro_api::read_dylib_info(&path).unwrap(); + assert!(info.version.1 >= 50); +} diff --git a/crates/proc-macro-srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs index 3679bfc43c..72a2dfe72d 100644 --- a/crates/proc-macro-srv/src/lib.rs +++ b/crates/proc-macro-srv/src/lib.rs @@ -20,6 +20,8 @@ mod dylib; mod abis; +pub mod cli; + use std::{ collections::{hash_map::Entry, HashMap}, env, @@ -149,7 +151,10 @@ impl EnvSnapshot { } } -pub mod cli; +#[cfg(all(feature = "sysroot-abi", test))] +mod tests; #[cfg(test)] -mod tests; +pub fn proc_macro_test_dylib_path() -> std::path::PathBuf { + proc_macro_test::PROC_MACRO_TEST_LOCATION.into() +} diff --git a/crates/proc-macro-srv/src/tests/mod.rs b/crates/proc-macro-srv/src/tests/mod.rs index 6339d56d01..b46cdddcf6 100644 --- a/crates/proc-macro-srv/src/tests/mod.rs +++ b/crates/proc-macro-srv/src/tests/mod.rs @@ -2,10 +2,10 @@ #[macro_use] mod utils; -use expect_test::expect; -use paths::AbsPathBuf; use utils::*; +use expect_test::expect; + #[test] fn test_derive_empty() { assert_expand("DeriveEmpty", r#"struct S;"#, expect![[r#"SUBTREE $"#]]); @@ -157,10 +157,3 @@ fn list_test_macros() { DeriveError [CustomDerive]"#]] .assert_eq(&res); } - -#[test] -fn test_version_check() { - let path = AbsPathBuf::assert(fixtures::proc_macro_test_dylib_path()); - let info = proc_macro_api::read_dylib_info(&path).unwrap(); - assert!(info.version.1 >= 50); -} diff --git a/crates/proc-macro-srv/src/tests/utils.rs b/crates/proc-macro-srv/src/tests/utils.rs index f881fe8684..44b1b6588d 100644 --- a/crates/proc-macro-srv/src/tests/utils.rs +++ b/crates/proc-macro-srv/src/tests/utils.rs @@ -1,15 +1,9 @@ //! utils used in proc-macro tests -use crate::dylib; -use crate::ProcMacroSrv; use expect_test::Expect; use std::str::FromStr; -pub mod fixtures { - pub fn proc_macro_test_dylib_path() -> std::path::PathBuf { - proc_macro_test::PROC_MACRO_TEST_LOCATION.into() - } -} +use crate::{dylib, proc_macro_test_dylib_path, ProcMacroSrv}; fn parse_string(code: &str) -> Option<crate::abis::TestTokenStream> { // This is a bit strange. We need to parse a string into a token stream into @@ -30,7 +24,7 @@ pub fn assert_expand_attr(macro_name: &str, ra_fixture: &str, attr_args: &str, e } fn assert_expand_impl(macro_name: &str, input: &str, attr: Option<&str>, expect: Expect) { - let path = fixtures::proc_macro_test_dylib_path(); + let path = proc_macro_test_dylib_path(); let expander = dylib::Expander::new(&path).unwrap(); let fixture = parse_string(input).unwrap(); let attr = attr.map(|attr| parse_string(attr).unwrap().into_subtree()); @@ -40,7 +34,7 @@ fn assert_expand_impl(macro_name: &str, input: &str, attr: Option<&str>, expect: } pub(crate) fn list() -> Vec<String> { - let dylib_path = fixtures::proc_macro_test_dylib_path(); + let dylib_path = proc_macro_test_dylib_path(); let mut srv = ProcMacroSrv::default(); let res = srv.list_macros(&dylib_path).unwrap(); res.into_iter().map(|(name, kind)| format!("{} [{:?}]", name, kind)).collect() diff --git a/crates/rust-analyzer/tests/slow-tests/main.rs b/crates/rust-analyzer/tests/slow-tests/main.rs index 4cc46af1b1..3e3f1c162f 100644 --- a/crates/rust-analyzer/tests/slow-tests/main.rs +++ b/crates/rust-analyzer/tests/slow-tests/main.rs @@ -18,7 +18,6 @@ mod tidy; use std::{collections::HashMap, path::PathBuf, time::Instant}; -use expect_test::expect; use lsp_types::{ notification::DidOpenTextDocument, request::{ @@ -821,7 +820,10 @@ fn main() { } #[test] +// FIXME: Re-enable once we can run proc-macro tests on rust-lang/rust-analyzer again +#[cfg(FALSE)] fn resolve_proc_macro() { + use expect_test::expect; if skip_slow_tests() { return; } |