testing cleanup

This commit is contained in:
Christien Rioux 2023-10-13 19:45:03 -04:00
parent c8555df863
commit f456f418d2
2 changed files with 13 additions and 6 deletions

View File

@ -14,7 +14,11 @@ crate-type = ["cdylib", "staticlib", "rlib"]
[features] [features]
default = ["rt-tokio"] 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 = [ rt-tokio = [
"tokio", "tokio",
"tokio-util", "tokio-util",
@ -26,7 +30,7 @@ rt-tokio = [
rt-wasm-bindgen = ["async_executors/bindgen", "async_executors/timer"] rt-wasm-bindgen = ["async_executors/bindgen", "async_executors/timer"]
veilid_tools_android_tests = ["dep:paranoid-android"] 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"] tracing = ["dep:tracing", "dep:tracing-subscriber"]
network-result-extra = [] network-result-extra = []
network-result-info = [] network-result-info = []

View File

@ -15,20 +15,23 @@ pub extern "C" fn run_veilid_tools_tests() {
pub fn veilid_tools_setup_ios_tests() { pub fn veilid_tools_setup_ios_tests() {
cfg_if! { cfg_if! {
if #[cfg(feature = "tracing")] { if #[cfg(feature = "tracing")] {
use tracing::level_filters::LevelFilter;
use tracing_oslog::OsLogger; use tracing_oslog::OsLogger;
use tracing_subscriber::prelude::*; 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 { 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() tracing_subscriber::registry()
.with(OsLogger::new("com.veilid.veilidtools-tests", "default"))
.with(LevelFilter::TRACE)
.with(filters) .with(filters)
.with(filter::LevelFilter::TRACE)
.with(OsLogger::new("com.veilid.veilidtools-tests", ""))
.init(); .init();
} else { } else {
use oslog::OsLogger; use oslog::OsLogger;
use log::LevelFilter;
OsLogger::new("com.veilid.veilidtools-tests") OsLogger::new("com.veilid.veilidtools-tests")
.level_filter(LevelFilter::Trace) .level_filter(LevelFilter::Trace)