Fixes #132 -- adds tests for more sysctl code

Author: alex

testlib/src/lib.rs

@@ -38,3 +38,14 @@ pub fn with_kernel_module<F: Fn()>(f: F) {
     let _m = LoadedModule::load(env::var("KERNEL_MODULE").unwrap());
     f();
 }
+
+pub fn assert_dmesg_contains(msgs: &[&[u8]]) {
+    let output = Command::new("dmesg").output().unwrap();
+    let lines = output.stdout.split(|x| *x == b'\n').collect::<Vec<_>>();
+    let mut lines: &[&[u8]] = &lines;
+    for msg in msgs {
+        let pos = lines.iter().position(|l| l.ends_with(msg));
+        assert!(pos.is_some());
+        lines = &lines[pos.unwrap()..];
+    }
+}

tests/printk/tests/tests.rs

@@ -1,17 +1,4 @@
-use std::process::Command;
-
-use kernel_module_testlib::with_kernel_module;
-
-fn assert_dmesg_contains(msgs: &[&[u8]]) {
-    let output = Command::new("dmesg").output().unwrap();
-    let lines = output.stdout.split(|x| *x == b'\n').collect::<Vec<_>>();
-    let mut lines: &[&[u8]] = &lines;
-    for msg in msgs {
-        let pos = lines.iter().position(|l| l.ends_with(msg));
-        assert!(pos.is_some());
-        lines = &lines[pos.unwrap()..];
-    }
-}
+use kernel_module_testlib::{assert_dmesg_contains, with_kernel_module};
 
 #[test]
 fn test_printk() {

tests/sysctl-get/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "sysctl-get-tests"
+version = "0.1.0"
+authors = ["Alex Gaynor <alex.gaynor@gmail.com", "Geoffrey Thomas <geofft@ldpreload.com>"]
+edition = "2018"
+
+[lib]
+crate-type = ["staticlib"]
+test = false
+
+[dependencies]
+linux-kernel-module = { path = "../.." }
+
+[dev-dependencies]
+kernel-module-testlib = { path = "../../testlib" }

tests/sysctl-get/src/lib.rs

@@ -0,0 +1,45 @@
+#![no_std]
+#![feature(const_str_as_bytes)]
+
+use core::sync::atomic::{AtomicBool, Ordering};
+
+use linux_kernel_module::{self, cstr, println};
+
+use linux_kernel_module::sysctl::Sysctl;
+use linux_kernel_module::Mode;
+
+static A_VAL: AtomicBool = AtomicBool::new(false);
+
+struct SysctlGetTestModule {
+    sysctl_a: Sysctl<&'static AtomicBool>,
+}
+
+impl linux_kernel_module::KernelModule for SysctlGetTestModule {
+    fn init() -> linux_kernel_module::KernelResult<Self> {
+        Ok(SysctlGetTestModule {
+            sysctl_a: Sysctl::register(
+                cstr!("rust/sysctl-get-tests"),
+                cstr!("a"),
+                &A_VAL,
+                Mode::from_int(0o666),
+            )?,
+        })
+    }
+}
+
+impl Drop for SysctlGetTestModule {
+    fn drop(&mut self) {
+        println!("A_VAL: {:?}", A_VAL.load(Ordering::Relaxed));
+        println!(
+            "SYSCTL_A: {:?}",
+            self.sysctl_a.get().load(Ordering::Relaxed)
+        );
+    }
+}
+
+linux_kernel_module::kernel_module!(
+    SysctlGetTestModule,
+    author: "Alex Gaynor and Geoffrey Thomas",
+    description: "A module for testing sysctls",
+    license: "GPL"
+);

tests/sysctl-get/tests/tests.rs

@@ -0,0 +1,11 @@
+use std::fs;
+
+use kernel_module_testlib::{assert_dmesg_contains, with_kernel_module};
+
+#[test]
+fn test_get() {
+    with_kernel_module(|| {
+        fs::write("/proc/sys/rust/sysctl-get-tests/a", "1").unwrap();
+    });
+    assert_dmesg_contains(&[b"A_VAL: true", b"SYSCTL_A: true"]);
+}