Rejigger the way we write tests to integrate with cargo

Author: alex

testlib/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "kernel-module-testlib"
+version = "0.1.0"
+authors = ["Alex Gaynor <[email protected]>"]
+edition = "2018"
+
+[dependencies]

tests/testlib.rs renamed to testlib/src/lib.rs

@@ -6,6 +6,10 @@ edition = "2018"
 
 [lib]
 crate-type = ["staticlib"]
+test = false
 
 [dependencies]
 linux-kernel-module = { path = "../.." }
+
+[dev-dependencies]
+kernel-module-testlib = { path = "../../testlib" }

tests/chrdev-region-allocation/Cargo.toml

@@ -1,6 +1,7 @@
-use kernel_module_tests::with_kernel_module;
 use std::fs;
 
+use kernel_module_testlib::with_kernel_module;
+
 #[test]
 fn test_proc_devices() {
     with_kernel_module(|| {
@@ -16,10 +17,8 @@ fn test_proc_devices() {
     });
 
     let devices = fs::read_to_string("/proc/devices").unwrap();
-    assert!(
-        devices
-            .lines()
-            .find(|l| l.ends_with("chrdev-region-allocation-tests"))
-            .is_none()
-    );
+    assert!(devices
+        .lines()
+        .find(|l| l.ends_with("chrdev-region-allocation-tests"))
+        .is_none());
 }

tests/chrdev-region-allocation/tests.rs renamed to tests/chrdev-region-allocation/tests/tests.rs

@@ -6,6 +6,10 @@ edition = "2018"
 
 [lib]
 crate-type = ["staticlib"]
+test = false
 
 [dependencies]
 linux-kernel-module = { path = "../.." }
+
+[dev-dependencies]
+kernel-module-testlib = { path = "../../testlib" }

tests/printk/Cargo.toml

@@ -1,6 +1,6 @@
 use std::process::Command;
 
-use kernel_module_tests::with_kernel_module;
+use kernel_module_testlib::with_kernel_module;
 
 fn assert_dmesg_contains(msgs: &[&[u8]]) {
     let output = Command::new("dmesg").output().unwrap();

tests/printk/tests.rs renamed to tests/printk/tests/tests.rs

@@ -17,12 +17,10 @@ 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
-            not os.path.exists(os.path.join(BASE_DIR, path, "tests.rs"))
+            not os.path.exists(os.path.join(BASE_DIR, path, "tests"))
         ):
             continue
 
@@ -47,25 +45,21 @@ def main():
                 path.replace("-", "_")
             ),
         )
-        run(
-            "rustc",
-            "--test",
-            "-Dwarnings",
-            "--edition", "2018",
-            "--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(
-            os.path.join(BASE_DIR, path, "tests"), "--test-threads=1",
+            "cargo", "test", "--", "--test-threads=1",
+            cwd=os.path.join(BASE_DIR, path),
             environ=dict(
                 os.environ,
-                KERNEL_MODULE=os.path.join(BASE_DIR, "testmodule.ko")
+                KERNEL_MODULE=os.path.join(BASE_DIR, "testmodule.ko"),
+                RUSTFLAGS="-Dwarnings",
+                CARGO_TARGET_DIR=os.path.relpath(
+                    os.path.join(BASE_DIR, "target"),
+                    os.path.join(BASE_DIR, path)
+                ),
             )
         )
 
 
-
 if __name__ == "__main__":
     main()

tests/run_tests.py

@@ -6,6 +6,10 @@ edition = "2018"
 
 [lib]
 crate-type = ["staticlib"]
+test = false
 
 [dependencies]
 linux-kernel-module = { path = "../.." }
+
+[dev-dependencies]
+kernel-module-testlib = { path = "../../testlib" }

tests/sysctl/Cargo.toml

@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::Path;
 
-use kernel_module_tests::with_kernel_module;
+use kernel_module_testlib::with_kernel_module;
 
 #[test]
 fn test_read_bool_default() {