diff options
| author | bors <bors@rust-lang.org> | 2023-06-19 13:34:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-19 13:34:51 +0000 |
| commit | 8eef45212b9753ca44c10869eee6436e2a0af1c0 (patch) | |
| tree | 13d83ea653a766221231c7fb768a9841a3006158 | |
| parent | 0fe5266b6d5aa76151726b40264662b86f41011d (diff) | |
| parent | 8d33b39b4a6e5d9ddba755e2c81e79b954032c58 (diff) | |
| download | rust-8eef45212b9753ca44c10869eee6436e2a0af1c0.tar.gz rust-8eef45212b9753ca44c10869eee6436e2a0af1c0.zip | |
Auto merge of #15089 - Veykril:slow-test-logs, r=Veykril
fix: Use RA_LOG in slow tests logging infra again
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/support.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crates/rust-analyzer/tests/slow-tests/support.rs b/crates/rust-analyzer/tests/slow-tests/support.rs index 1cae8688eb2..2da87f29713 100644 --- a/crates/rust-analyzer/tests/slow-tests/support.rs +++ b/crates/rust-analyzer/tests/slow-tests/support.rs @@ -13,6 +13,7 @@ use rust_analyzer::{config::Config, lsp_ext, main_loop}; use serde::Serialize; use serde_json::{json, to_string_pretty, Value}; use test_utils::FixtureWithProjectMeta; +use tracing_subscriber::{prelude::*, Layer}; use vfs::AbsPathBuf; use crate::testdir::TestDir; @@ -76,13 +77,11 @@ impl<'a> Project<'a> { let tmp_dir = self.tmp_dir.unwrap_or_else(TestDir::new); static INIT: Once = Once::new(); INIT.call_once(|| { - tracing_subscriber::fmt() - .with_test_writer() - // FIXME: I am not smart enough to figure out how to use this with - // `tracing_subscriber::filter::Targets`. - // - // .with_env_filter(tracing_subscriber::EnvFilter::from_env("RA_LOG")) - .init(); + let filter: tracing_subscriber::filter::Targets = + std::env::var("RA_LOG").ok().and_then(|it| it.parse().ok()).unwrap_or_default(); + let layer = + tracing_subscriber::fmt::Layer::new().with_test_writer().with_filter(filter); + tracing_subscriber::Registry::default().with(layer).init(); profile::init_from(crate::PROFILE); }); |
