diff options
| author | Amos Wenger <amoswenger@gmail.com> | 2022-07-20 15:49:40 +0200 |
|---|---|---|
| committer | Amos Wenger <amoswenger@gmail.com> | 2022-07-20 15:49:40 +0200 |
| commit | c5204087316a79be9e39d9944cd5380313fe095e (patch) | |
| tree | 7ea66233e5f142f07bd95098bdd869ef9543c4aa | |
| parent | 28bab681e935b850cf31c17b5082c6e82fd74463 (diff) | |
| download | rust-c5204087316a79be9e39d9944cd5380313fe095e.tar.gz rust-c5204087316a79be9e39d9944cd5380313fe095e.zip | |
Allow merge commits when 'in-rust-tree' feature is enabled
This adds an `in-rust-tree` feature that will be enabled when rust-analyzer is built from `rust-lang/rust`. Due to the way "git subtree" works, that test _will_ find merge commits and fail, so we simply skip it.
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/tidy.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index c37a0d17491..6998209a078 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -84,3 +84,4 @@ mbe = { path = "../mbe" } [features] jemalloc = ["jemallocator", "profile/jemalloc"] force-always-assert = ["always-assert/force"] +in-rust-tree = [] diff --git a/crates/rust-analyzer/tests/slow-tests/tidy.rs b/crates/rust-analyzer/tests/slow-tests/tidy.rs index 1d666fdf0f3..63337214cd6 100644 --- a/crates/rust-analyzer/tests/slow-tests/tidy.rs +++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs @@ -142,6 +142,7 @@ fn check_cargo_toml(path: &Path, text: String) { } } +#[cfg(not(feature = "in-rust-tree"))] #[test] fn check_merge_commits() { let sh = &Shell::new().unwrap(); |