Fix test compilation.

twizzler-operating-system · Nov 22, 2024 · f6bd3da · f6bd3da
1 parent 4b4b68a
commit f6bd3da
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/abi b/src/abi
diff --git a/src/lib/twizzler-abi/Cargo.toml b/src/lib/twizzler-abi/Cargo.toml
@@ -21,3 +21,6 @@ version = "0.5"
 [features]
 # Activate if compiling for the kernel.
 kernel = ["volatile"]
+
+[dev-dependencies]
+twizzler-minruntime = { path = "../../runtime/minruntime" }
diff --git a/src/lib/twizzler-abi/src/lib.rs b/src/lib/twizzler-abi/src/lib.rs
@@ -92,6 +92,7 @@ extern crate test;
 #[cfg(test)]
 mod tester {
     use crate::print_err;
+    extern crate twizzler_minruntime;
 
     #[bench]
     fn test_bench(bench: &mut test::Bencher) {

diff --git a/src/lib/twizzler-driver/Cargo.toml b/src/lib/twizzler-driver/Cargo.toml
@@ -13,3 +13,6 @@ futures = "0.3.21"
 async-trait = "0.1.56"
 bitflags = "2.4.1"
 volatile = { version = "0.5", features = ["unstable"] }
+
+[dev-dependencies]
+twizzler-minruntime = { path = "../../runtime/minruntime" }
diff --git a/src/lib/twizzler-driver/src/lib.rs b/src/lib/twizzler-driver/src/lib.rs
@@ -40,6 +40,7 @@ pub fn get_bustree_root() -> BusTreeRoot {
 
 #[cfg(test)]
 mod tests {
+    extern crate twizzler_minruntime;
     #[test]
     fn it_works() {
         let result = 2 + 2;

diff --git a/src/lib/twizzler-queue-raw/Cargo.toml b/src/lib/twizzler-queue-raw/Cargo.toml
@@ -7,8 +7,11 @@ edition = "2021"
 
 [dependencies]
 bitflags = "2.4.1"
-twizzler-abi = {path = "../twizzler-abi", version = "*"}
+twizzler-abi = { path = "../twizzler-abi", version = "*" }
 
 [features]
 std = []
 default = ["std"]
+
+[dev-dependencies]
+twizzler-minruntime = { path = "../../runtime/minruntime" }
diff --git a/src/lib/twizzler-queue-raw/src/lib.rs b/src/lib/twizzler-queue-raw/src/lib.rs
@@ -589,6 +589,7 @@ mod tests {
     use crate::multi_receive;
     use crate::{QueueEntry, QueueError, RawQueue, RawQueueHdr, ReceiveFlags, SubmissionFlags};
 
+    extern crate twizzler_minruntime;
     fn wait(x: &AtomicU64, v: u64) {
         // println!("wait");
         while x.load(Ordering::SeqCst) == v {

diff --git a/src/runtime/secgate/src/util/mod.rs b/src/runtime/secgate/src/util/mod.rs
@@ -5,3 +5,6 @@ mod handle;
 
 pub use buffer::*;
 pub use handle::*;
+
+#[cfg(test)]
+extern crate twizzler_minruntime;
diff --git a/tools/xtask/src/build.rs b/tools/xtask/src/build.rs
@@ -286,11 +286,23 @@ fn maybe_build_tests<'a>(
                 "nvme" => None,
                 "twz-rt" => None,
                 "monitor" => None,
+                "monitor-api" => None,
                 "bootstrap" => None,
+                "dynlink" => None,
+                "layout" => None,
+                "lethe-gadget-fat" => None,
                 "secgate-macros" => None,
                 "layout-derive" => None,
                 "twizzler-rt-abi" => None,
                 "twizzler-types" => None,
+                "twizzler-object" => None,
+                "twizzler-nando" => None,
+                "twizzler-net" => None,
+                "twizzler-futures" => None,
+                "twizzler-async" => None,
+                "twizzler-queue" => None,
+                "twizzler-kernel-macros" => None,
+                "twizzler-runtime-api" => None,
                 _ => Some(p.name().to_string()),
             })
             .collect(),

diff --git a/tools/xtask/src/toolchain.rs b/tools/xtask/src/toolchain.rs
@@ -291,7 +291,7 @@ pub fn set_dynamic() {
         "RUSTFLAGS",
         "-C prefer-dynamic=y -Z staticlib-prefer-dynamic=y",
     );
-    std::env::set_var("CARGO_TARGET_DIR", "target");
+    std::env::set_var("CARGO_TARGET_DIR", "target/dynamic");
 }
 
 pub fn set_static() {