Fix tests.

gz · gz · commit 2d7a8ce4f2b2 · 2022-06-14T23:16:12.000-07:00
diff --git a/kernel/src/arch/x86_64/rackscale/mkdir.rs b/kernel/src/arch/x86_64/rackscale/mkdir.rs
@@ -79,7 +79,8 @@ pub(crate) fn handle_mkdir(hdr: &mut RPCHeader, payload: &mut [u8]) -> Result<()
         }
     };
 
-    let path = core::str::from_utf8(&payload[core::mem::size_of::<MkDirReq>()..])?;
+    let path =
+        core::str::from_utf8(&payload[core::mem::size_of::<MkDirReq>()..hdr.msg_len as usize])?;
     let path_string: String = TryString::try_from(path)?.into();
     let mkdir_req = cnrfs::MlnrKernelNode::mkdir(local_pid, path_string, modes);
 
diff --git a/usr/init/src/init.rs b/usr/init/src/init.rs
@@ -512,7 +512,7 @@ fn fs_test() {
 
         // Open a file
         let fd = vibrio::syscalls::Fs::open(
-            "file.txt",
+            "mydir/file.txt",
             FileFlags::O_RDWR | FileFlags::O_CREAT,
             FileModes::S_IRWXU,
         )
diff --git a/usr/init/src/vmops/mod.rs b/usr/init/src/vmops/mod.rs
@@ -26,7 +26,7 @@ unsafe extern "C" fn maponly_bencher_trampoline(arg1: *mut u8) -> *mut u8 {
     ptr::null_mut()
 }
 
-fn maponly_bencher(_cores: usize) {
+fn maponly_bencher(cores: usize) {
     use vibrio::syscalls::*;
     info!("Trying to allocate a frame");
     let (frame_id, _paddr) =

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ pub(crate) fn handle_mkdir(hdr: &mut RPCHeader, payload: &mut [u8]) -> Result<()`
`79`	`79`	`}`
`80`	`80`	`};`
`81`	`81`
`82`		`- let path = core::str::from_utf8(&payload[core::mem::size_of::<MkDirReq>()..])?;`
	`82`	`+ let path =`
	`83`	`+ core::str::from_utf8(&payload[core::mem::size_of::<MkDirReq>()..hdr.msg_len as usize])?;`
`83`	`84`	`let path_string: String = TryString::try_from(path)?.into();`
`84`	`85`	`let mkdir_req = cnrfs::MlnrKernelNode::mkdir(local_pid, path_string, modes);`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ fn fs_test() {`
`512`	`512`
`513`	`513`	`// Open a file`
`514`	`514`	`let fd = vibrio::syscalls::Fs::open(`
`515`		`- "file.txt",`
	`515`	`+ "mydir/file.txt",`
`516`	`516`	`FileFlags::O_RDWR \| FileFlags::O_CREAT,`
`517`	`517`	`FileModes::S_IRWXU,`
`518`	`518`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ unsafe extern "C" fn maponly_bencher_trampoline(arg1: mut u8) -> mut u8 {`
`26`	`26`	`ptr::null_mut()`
`27`	`27`	`}`
`28`	`28`
`29`		`-fn maponly_bencher(_cores: usize) {`
	`29`	`+fn maponly_bencher(cores: usize) {`
`30`	`30`	`use vibrio::syscalls::*;`
`31`	`31`	`info!("Trying to allocate a frame");`
`32`	`32`	`let (frame_id, _paddr) =`