tests: Move device-node code into testlib

Author: geofft

testlib/Cargo.toml

@@ -5,3 +5,5 @@ authors = ["Alex Gaynor <alex.gaynor@gmail.com>"]
 edition = "2018"
 
 [dependencies]
+tempfile = "3"
+libc = "0.2.58"

testlib/src/lib.rs

@@ -1,6 +1,10 @@
 use std::env;
+use std::fs;
+use std::path::PathBuf;
 use std::process::Command;
 
+use tempfile::TempDir;
+
 struct LoadedModule {
     name: String,
 }
@@ -50,3 +54,45 @@ pub fn assert_dmesg_contains(msgs: &[&[u8]]) {
         lines = &lines[pos.unwrap()..];
     }
 }
+
+pub fn get_device_major_number(name: &str) -> libc::dev_t {
+    let devices = fs::read_to_string("/proc/devices").unwrap();
+    let dev_no_line = devices.lines().find(|l| l.ends_with(name)).unwrap();
+    let elements = dev_no_line.rsplitn(2, " ").collect::<Vec<_>>();
+    assert_eq!(elements.len(), 2);
+    assert_eq!(elements[0], name);
+    return elements[1].trim().parse().unwrap();
+}
+
+pub fn temporary_file_path() -> PathBuf {
+    let mut p = TempDir::new().unwrap().into_path();
+    p.push("device");
+    return p;
+}
+
+pub struct UnlinkOnDrop<'a> {
+    path: &'a PathBuf,
+}
+
+impl Drop for UnlinkOnDrop<'_> {
+    fn drop(&mut self) {
+        Command::new("sudo")
+            .arg("rm")
+            .arg(self.path.to_str().unwrap())
+            .status()
+            .unwrap();
+    }
+}
+
+pub fn mknod(path: &PathBuf, major: libc::dev_t, minor: libc::dev_t) -> UnlinkOnDrop {
+    Command::new("sudo")
+        .arg("mknod")
+        .arg("--mode=a=rw")
+        .arg(path.to_str().unwrap())
+        .arg("c")
+        .arg(major.to_string())
+        .arg(minor.to_string())
+        .status()
+        .unwrap();
+    return UnlinkOnDrop { path };
+}

tests/chrdev/Cargo.toml

@@ -17,4 +17,3 @@ linux-kernel-module = { path = "../..", optional = true }
 [dev-dependencies]
 kernel-module-testlib = { path = "../../testlib" }
 libc = "0.2.58"
-tempfile = "3"

tests/chrdev/tests/tests.rs

@@ -1,76 +1,26 @@
 use std::fs;
 use std::io::{Read, Seek, SeekFrom, Write};
 use std::os::unix::prelude::FileExt;
-use std::path::PathBuf;
-use std::process::Command;
 
-use libc;
-
-use tempfile::TempDir;
-
-use kernel_module_testlib::with_kernel_module;
-
-fn get_device_major_number() -> libc::dev_t {
-    let devices = fs::read_to_string("/proc/devices").unwrap();
-    let dev_no_line = devices
-        .lines()
-        .find(|l| l.ends_with("chrdev-tests"))
-        .unwrap();
-    let elements = dev_no_line.rsplitn(2, " ").collect::<Vec<_>>();
-    assert_eq!(elements.len(), 2);
-    assert_eq!(elements[0], "chrdev-tests");
-    return elements[1].trim().parse().unwrap();
-}
-
-fn temporary_file_path() -> PathBuf {
-    let mut p = TempDir::new().unwrap().into_path();
-    p.push("device");
-    return p;
-}
-
-struct UnlinkOnDrop<'a> {
-    path: &'a PathBuf,
-}
-
-impl Drop for UnlinkOnDrop<'_> {
-    fn drop(&mut self) {
-        Command::new("sudo")
-            .arg("rm")
-            .arg(self.path.to_str().unwrap())
-            .status()
-            .unwrap();
-    }
-}
-
-fn mknod(path: &PathBuf, major: libc::dev_t, minor: libc::dev_t) -> UnlinkOnDrop {
-    Command::new("sudo")
-        .arg("mknod")
-        .arg("--mode=a=rw")
-        .arg(path.to_str().unwrap())
-        .arg("c")
-        .arg(major.to_string())
-        .arg(minor.to_string())
-        .status()
-        .unwrap();
-    return UnlinkOnDrop { path };
-}
+use kernel_module_testlib::*;
 
+const DEVICE_NAME: &'static str = "chrdev-tests";
 const READ_FILE_MINOR: libc::dev_t = 0;
 const SEEK_FILE_MINOR: libc::dev_t = 1;
 const WRITE_FILE_MINOR: libc::dev_t = 2;
 
 #[test]
 fn test_mknod() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         mknod(&temporary_file_path(), device_number, READ_FILE_MINOR);
     });
 }
 
 #[test]
 fn test_read() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, READ_FILE_MINOR);
 
@@ -84,7 +34,7 @@ fn test_read() {
 #[test]
 fn test_read_offset() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, READ_FILE_MINOR);
 
@@ -100,7 +50,7 @@ fn test_read_offset() {
 #[test]
 fn test_read_at() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, READ_FILE_MINOR);
 
@@ -114,7 +64,7 @@ fn test_read_at() {
 #[test]
 fn test_read_unimplemented() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, SEEK_FILE_MINOR);
 
@@ -130,7 +80,7 @@ fn test_read_unimplemented() {
 #[test]
 fn test_lseek_unimplemented() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, READ_FILE_MINOR);
 
@@ -162,7 +112,7 @@ fn test_lseek_unimplemented() {
 #[test]
 fn test_lseek() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, SEEK_FILE_MINOR);
 
@@ -184,7 +134,7 @@ fn test_lseek() {
 #[test]
 fn test_write_unimplemented() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, READ_FILE_MINOR);
 
@@ -199,7 +149,7 @@ fn test_write_unimplemented() {
 #[test]
 fn test_write() {
     with_kernel_module(|| {
-        let device_number = get_device_major_number();
+        let device_number = get_device_major_number(DEVICE_NAME);
         let p = temporary_file_path();
         let _u = mknod(&p, device_number, WRITE_FILE_MINOR);