Skip to content

tests: lsmem: Use tempfile::TempDir for test sysroot #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tests: lsmem: Use tempfile::TempDir for test sysroot #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions tests/by-util/test_lsmem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const MEMORY_BLOCK_IDS: [usize; 125] = [
];

struct TestSysMemory {
sysroot: String,
sysroot: tempfile::TempDir,
}

/// Builds up a fake /sys/devices/system/memory filesystem.
Expand All @@ -35,11 +35,9 @@ struct TestSysMemory {
/// And removes it automatically after the reference is dropped.
impl TestSysMemory {
fn new() -> Self {
let random = rand::random::<u32>();
let sysroot = Path::new(&env!("CARGO_MANIFEST_DIR"))
.join("target")
.join(format!("testsysmem-{random}"));
let sysroot = tempfile::tempdir().unwrap();
let sysmem = sysroot
.path()
.join("sys")
.join("devices")
.join("system")
Expand All @@ -60,21 +58,13 @@ impl TestSysMemory {
write_file_content(&node_dir, ".gitkeep", "");
}

TestSysMemory {
sysroot: sysroot.display().to_string(),
}
}
}

impl Drop for TestSysMemory {
fn drop(&mut self) {
std::fs::remove_dir_all(&self.sysroot).unwrap();
TestSysMemory { sysroot }
}
}

fn sysroot_test_with_args(test_root: &TestSysMemory, expected_output: &str, args: &[&str]) {
let mut cmd = new_ucmd!();
cmd.arg("-s").arg(&test_root.sysroot);
cmd.arg("-s").arg(test_root.sysroot.path());
for arg in args {
cmd.arg(arg);
}
Expand Down