WIP tests - squash me

Author: timrobertsdev

uefi-test-runner/src/proto/mod.rs

@@ -29,6 +29,7 @@ pub fn test(image: Handle, st: &mut SystemTable<Boot>) {
         target_arch = "aarch64"
     ))]
     shim::test(bt);
+    shell::test(bt);
     tcg::test(bt);
 }
 
@@ -69,6 +70,7 @@ mod rng;
     target_arch = "arm",
     target_arch = "aarch64"
 ))]
+mod shell;
 mod shim;
 mod string;
 mod tcg;

uefi-test-runner/src/proto/shell.rs

@@ -0,0 +1,28 @@
+use uefi::CStr16;
+use uefi::prelude::BootServices;
+use uefi::proto::shell::Shell;
+
+pub fn test(bt: &BootServices) {
+    info!("Running shell protocol tests");
+
+    let handle = bt.get_handle_for_protocol::<Shell>().expect("No Shell handles");
+
+    let mut shell = bt
+        .open_protocol_exclusive::<Shell>(handle)
+        .expect("Failed to open Shell protocol");
+
+    // create some files
+    let mut test_buf = [0u16; 12];
+    let test_str = CStr16::from_str_with_buf("test", &mut test_buf).unwrap();
+    shell.create_file(test_str, 0);
+
+    // get file tree
+    let mut str_buf = [0u16; 12];
+    let str_str = CStr16::from_str_with_buf(r"Z:\*", &mut str_buf).unwrap();
+    let res = shell.find_files(str_str);
+    let list = res.unwrap();
+    let list = list.unwrap();
+    let first = list.first();
+
+    info!("filetree test successful")
+}

uefi/src/proto/shell/mod.rs

@@ -175,7 +175,11 @@ impl Shell {
     /// TODO
     pub fn find_files(&self, file_pattern: &CStr16) -> Result<Option<FileList>> {
         let mut out_list: MaybeUninit<*mut ShellFileInfo> = MaybeUninit::uninit();
-        (self.find_files)(file_pattern, out_list.as_mut_ptr()).to_result_with_val(|| {
+        let mut out_ptr = out_list.as_mut_ptr();
+        if out_ptr.is_null() {
+            panic!("outptr null");
+        }
+        (self.find_files)(file_pattern, out_ptr).to_result_with_val(|| {
             // safety: if we're here, out_list is valid, but maybe null
             let out_list = unsafe { out_list.assume_init() };
             if out_list.is_null() {