Merge pull request #95 from ryanbreen/feature/cat-ls-tests

feat(coreutils): add comprehensive test suites for cat and ls

Author: ryanbreen

kernel/src/main.rs

@@ -859,6 +859,10 @@ fn kernel_main_continue() -> ! {
         test_exec::test_wc_coreutil();
         log::info!("=== COREUTIL TEST: which (command location) ===");
         test_exec::test_which_coreutil();
+        log::info!("=== COREUTIL TEST: cat (file concatenation) ===");
+        test_exec::test_cat_coreutil();
+        log::info!("=== COREUTIL TEST: ls (directory listing) ===");
+        test_exec::test_ls_coreutil();
 
         // Test Rust std library support
         log::info!("=== STD TEST: Rust std library support ===");

kernel/src/test_exec.rs

@@ -2735,3 +2735,61 @@ pub fn test_which_coreutil() {
         }
     }
 }
+
+/// Test the `cat` coreutil
+///
+/// Verifies that /bin/cat correctly outputs file contents.
+pub fn test_cat_coreutil() {
+    log::info!("Testing cat coreutil (file concatenation)");
+
+    #[cfg(feature = "testing")]
+    let cat_test_elf_buf = crate::userspace_test::get_test_binary("cat_test");
+    #[cfg(feature = "testing")]
+    let cat_test_elf: &[u8] = &cat_test_elf_buf;
+    #[cfg(not(feature = "testing"))]
+    let cat_test_elf = &create_hello_world_elf();
+
+    match crate::process::creation::create_user_process(
+        String::from("cat_test"),
+        cat_test_elf,
+    ) {
+        Ok(pid) => {
+            log::info!("Created cat_test process with PID {:?}", pid);
+            log::info!("cat_test: process scheduled for execution.");
+            log::info!("    -> Userspace will emit CAT_TEST_PASSED marker if successful");
+        }
+        Err(e) => {
+            log::error!("Failed to create cat_test process: {}", e);
+            log::error!("cat_test cannot run without valid userspace process");
+        }
+    }
+}
+
+/// Test the `ls` coreutil
+///
+/// Verifies that /bin/ls correctly lists directory contents.
+pub fn test_ls_coreutil() {
+    log::info!("Testing ls coreutil (directory listing)");
+
+    #[cfg(feature = "testing")]
+    let ls_test_elf_buf = crate::userspace_test::get_test_binary("ls_test");
+    #[cfg(feature = "testing")]
+    let ls_test_elf: &[u8] = &ls_test_elf_buf;
+    #[cfg(not(feature = "testing"))]
+    let ls_test_elf = &create_hello_world_elf();
+
+    match crate::process::creation::create_user_process(
+        String::from("ls_test"),
+        ls_test_elf,
+    ) {
+        Ok(pid) => {
+            log::info!("Created ls_test process with PID {:?}", pid);
+            log::info!("ls_test: process scheduled for execution.");
+            log::info!("    -> Userspace will emit LS_TEST_PASSED marker if successful");
+        }
+        Err(e) => {
+            log::error!("Failed to create ls_test process: {}", e);
+            log::error!("ls_test cannot run without valid userspace process");
+        }
+    }
+}

userspace/tests/Cargo.toml

@@ -324,6 +324,14 @@ path = "wc_test.rs"
 name = "which_test"
 path = "which_test.rs"
 
+[[bin]]
+name = "cat_test"
+path = "cat_test.rs"
+
+[[bin]]
+name = "ls_test"
+path = "ls_test.rs"
+
 [[bin]]
 name = "fork_memory_test"
 path = "fork_memory_test.rs"

userspace/tests/build.sh

@@ -127,6 +127,8 @@ BINARIES=(
     "tail_test"
     "wc_test"
     "which_test"
+    "cat_test"
+    "ls_test"
 )
 
 echo "Building ${#BINARIES[@]} userspace binaries with libbreenix..."