diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 234d6d1e..5f32a588 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -14,7 +14,11 @@ crate-type = ["cdylib", "staticlib", "rlib"] [features] default = ["rt-tokio"] -rt-async-std = ["async-std", "async_executors/async_std", "rtnetlink/smol_socket"] +rt-async-std = [ + "async-std", + "async_executors/async_std", + "rtnetlink/smol_socket", +] rt-tokio = [ "tokio", "tokio-util", @@ -26,7 +30,7 @@ rt-tokio = [ rt-wasm-bindgen = ["async_executors/bindgen", "async_executors/timer"] veilid_tools_android_tests = ["dep:paranoid-android"] -veilid_tools_ios_tests = ["dep:oslog", "dep:tracing-oslog"] +veilid_tools_ios_tests = ["dep:tracing", "dep:oslog", "dep:tracing-oslog"] tracing = ["dep:tracing", "dep:tracing-subscriber"] network-result-extra = [] network-result-info = [] diff --git a/veilid-tools/src/tests/ios/mod.rs b/veilid-tools/src/tests/ios/mod.rs index 77534395..ce4780df 100644 --- a/veilid-tools/src/tests/ios/mod.rs +++ b/veilid-tools/src/tests/ios/mod.rs @@ -15,20 +15,23 @@ pub extern "C" fn run_veilid_tools_tests() { pub fn veilid_tools_setup_ios_tests() { cfg_if! { if #[cfg(feature = "tracing")] { + use tracing::level_filters::LevelFilter; use tracing_oslog::OsLogger; use tracing_subscriber::prelude::*; + use tracing_subscriber::filter::Targets; - let mut filters = filter::Targets::new(); + let mut filters = Targets::new(); for ig in DEFAULT_LOG_IGNORE_LIST { - filters = filters.with_target(ig, filter::LevelFilter::OFF); + filters = filters.with_target(ig, LevelFilter::OFF); } tracing_subscriber::registry() + .with(OsLogger::new("com.veilid.veilidtools-tests", "default")) + .with(LevelFilter::TRACE) .with(filters) - .with(filter::LevelFilter::TRACE) - .with(OsLogger::new("com.veilid.veilidtools-tests", "")) .init(); } else { use oslog::OsLogger; + use log::LevelFilter; OsLogger::new("com.veilid.veilidtools-tests") .level_filter(LevelFilter::Trace)