From 23ce9e5bf0e02d8789d7644d364e76d81e8592de Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 16 Aug 2021 12:19:53 +0800 Subject: [PATCH] xous: arch: look for feature flag for tests When running tests, `processes-as-threads` gets enabled. Look for this feature flag to determine if we need to use that architecture. Note that this change requires `resolver v2` to be enabled. Signed-off-by: Sean Cross --- xous-rs/src/arch/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xous-rs/src/arch/mod.rs b/xous-rs/src/arch/mod.rs index 25bc9ed8b..f4d3780b0 100644 --- a/xous-rs/src/arch/mod.rs +++ b/xous-rs/src/arch/mod.rs @@ -1,14 +1,14 @@ #[cfg(any(target_os = "none", target_os = "xous"))] -pub mod native; +pub mod riscv; #[cfg(any(target_os = "none", target_os = "xous"))] -pub use native::*; +pub use riscv::*; -#[cfg(all(any(windows,unix), not(test)))] +#[cfg(all(any(windows,unix), not(feature = "processes-as-threads")))] pub mod hosted; -#[cfg(all(any(windows,unix), not(test)))] +#[cfg(all(any(windows,unix), not(feature = "processes-as-threads")))] pub use hosted::*; -#[cfg(all(any(windows,unix), test))] +#[cfg(feature = "processes-as-threads")] pub mod test; -#[cfg(all(any(windows,unix), test))] -pub use test::*; \ No newline at end of file +#[cfg(feature = "processes-as-threads")] +pub use test::*;