Factor out test utilities from the printk tests

Author: alex

tests/printk/tests.rs

@@ -1,40 +1,8 @@
-use std::env;
-use std::process::Command;
-
-struct LoadedModule {
-    name: String,
-}
-
-impl LoadedModule {
-    fn load(name: String) -> LoadedModule {
-        Command::new("sudo")
-            .arg("insmod")
-            .arg(&name)
-            .status()
-            .unwrap();
-        return LoadedModule { name };
-    }
-}
+extern crate kernel_module_tests;
 
-impl Drop for LoadedModule {
-    fn drop(&mut self) {
-        Command::new("sudo")
-            .arg("rmmod")
-            .arg(&self.name)
-            .status()
-            .unwrap();
-    }
-}
+use std::process::Command;
 
-fn with_kernel_module<F: Fn()>(f: F) {
-    Command::new("sudo")
-        .arg("dmesg")
-        .arg("-C")
-        .status()
-        .unwrap();
-    let _m = LoadedModule::load(env::var("KERNEL_MODULE").unwrap());
-    f();
-}
+use kernel_module_tests::with_kernel_module;
 
 fn assert_dmesg_contains(msgs: &[&[u8]]) {
     let output = Command::new("dmesg").output().unwrap();

tests/run_tests.py

@@ -17,6 +17,8 @@ def run(*args, **kwargs):
 
 
 def main():
+    run("rustc", "--crate-type=rlib", os.path.join(BASE_DIR, "testlib.rs"))
+
     for path in os.listdir(BASE_DIR):
         if (
             not os.path.isdir(os.path.join(BASE_DIR, path)) or
@@ -57,6 +59,7 @@ def main():
             "--test",
             "--out-dir", os.path.join(BASE_DIR, path),
             os.path.join(BASE_DIR, path, "tests.rs"),
+            "--extern", "kernel_module_tests=libtestlib.rlib"
         )
         # TODO: qemu
         run(

tests/testlib.rs

@@ -0,0 +1,37 @@
+use std::env;
+use std::process::Command;
+
+struct LoadedModule {
+    name: String,
+}
+
+impl LoadedModule {
+    fn load(name: String) -> LoadedModule {
+        Command::new("sudo")
+            .arg("insmod")
+            .arg(&name)
+            .status()
+            .unwrap();
+        return LoadedModule { name };
+    }
+}
+
+impl Drop for LoadedModule {
+    fn drop(&mut self) {
+        Command::new("sudo")
+            .arg("rmmod")
+            .arg(&self.name)
+            .status()
+            .unwrap();
+    }
+}
+
+pub fn with_kernel_module<F: Fn()>(f: F) {
+    Command::new("sudo")
+        .arg("dmesg")
+        .arg("-C")
+        .status()
+        .unwrap();
+    let _m = LoadedModule::load(env::var("KERNEL_MODULE").unwrap());
+    f();
+}