Fix tests

vinc · Oct 20, 2024 · 56737cb · 56737cb
1 parent 9dc1001
commit 56737cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/sys/fs/block_device.rs b/src/sys/fs/block_device.rs
@@ -86,7 +86,7 @@ impl BlockDeviceIO for MemBlockDevice {
 }
 
 pub fn mount_mem() {
-    let mem = sys::mem::memory_size() / 2; // Half the allocatable memory
+    let mem = sys::mem::memory_free() / 2;
     let len = mem / super::BLOCK_SIZE; // TODO: take a size argument
     let dev = MemBlockDevice::new(len);
     *BLOCK_DEVICE.lock() = Some(BlockDevice::Mem(dev));

diff --git a/src/sys/mem/heap.rs b/src/sys/mem/heap.rs
@@ -140,6 +140,8 @@ fn many_boxes() {
 
 #[test_case]
 fn large_vec() {
+    use alloc::vec::Vec;
+
     let n = 1000;
     let mut vec = Vec::new();
     for i in 0..n {

diff --git a/src/sys/mem/mod.rs b/src/sys/mem/mod.rs
@@ -83,7 +83,7 @@ pub fn memory_used() -> usize {
 }
 
 pub fn memory_free() -> usize {
-    (memory_size() - heap::heap_size()) + heap::heap_free()
+    heap::heap_free()
 }
 
 pub fn phys_to_virt(addr: PhysAddr) -> VirtAddr {