Skip to content

Commit 22badd8

Browse files
ryanbreenryanbreen
authored
Merge pull request #94 from ryanbreen/feature/more-coreutils
feat(coreutils): add which utility and comprehensive test suites
2 parents b507d9d + dfc638c commit 22badd8

File tree

20 files changed

+2509
-34
lines changed

20 files changed

+2509
-34
lines changed

‎kernel/src/main.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,20 @@ fn kernel_main_continue() -> ! {
846846
log::info!("=== FS TEST: block allocation regression test ===");
847847
test_exec::test_fs_block_alloc();
848848

849+
// Coreutil tests - verify true, false, head, tail, wc work correctly
850+
log::info!("=== COREUTIL TEST: true (exit code 0) ===");
851+
test_exec::test_true_coreutil();
852+
log::info!("=== COREUTIL TEST: false (exit code 1) ===");
853+
test_exec::test_false_coreutil();
854+
log::info!("=== COREUTIL TEST: head (first N lines) ===");
855+
test_exec::test_head_coreutil();
856+
log::info!("=== COREUTIL TEST: tail (last N lines) ===");
857+
test_exec::test_tail_coreutil();
858+
log::info!("=== COREUTIL TEST: wc (line/word/byte counts) ===");
859+
test_exec::test_wc_coreutil();
860+
log::info!("=== COREUTIL TEST: which (command location) ===");
861+
test_exec::test_which_coreutil();
862+
849863
// Test Rust std library support
850864
log::info!("=== STD TEST: Rust std library support ===");
851865
test_exec::test_hello_std_real();

‎kernel/src/test_exec.rs‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,3 +2561,177 @@ pub fn test_shell_pipe() {
25612561
}
25622562
}
25632563
}
2564+
2565+
/// Test the `true` coreutil
2566+
///
2567+
/// Verifies that /bin/true correctly exits with code 0.
2568+
pub fn test_true_coreutil() {
2569+
log::info!("Testing true coreutil (exit code 0)");
2570+
2571+
#[cfg(feature = "testing")]
2572+
let true_test_elf_buf = crate::userspace_test::get_test_binary("true_test");
2573+
#[cfg(feature = "testing")]
2574+
let true_test_elf: &[u8] = &true_test_elf_buf;
2575+
#[cfg(not(feature = "testing"))]
2576+
let true_test_elf = &create_hello_world_elf();
2577+
2578+
match crate::process::creation::create_user_process(
2579+
String::from("true_test"),
2580+
true_test_elf,
2581+
) {
2582+
Ok(pid) => {
2583+
log::info!("Created true_test process with PID {:?}", pid);
2584+
log::info!("true_test: process scheduled for execution.");
2585+
log::info!(" -> Userspace will emit TRUE_TEST_PASSED marker if successful");
2586+
}
2587+
Err(e) => {
2588+
log::error!("Failed to create true_test process: {}", e);
2589+
log::error!("true_test cannot run without valid userspace process");
2590+
}
2591+
}
2592+
}
2593+
2594+
/// Test the `false` coreutil
2595+
///
2596+
/// Verifies that /bin/false correctly exits with code 1.
2597+
pub fn test_false_coreutil() {
2598+
log::info!("Testing false coreutil (exit code 1)");
2599+
2600+
#[cfg(feature = "testing")]
2601+
let false_test_elf_buf = crate::userspace_test::get_test_binary("false_test");
2602+
#[cfg(feature = "testing")]
2603+
let false_test_elf: &[u8] = &false_test_elf_buf;
2604+
#[cfg(not(feature = "testing"))]
2605+
let false_test_elf = &create_hello_world_elf();
2606+
2607+
match crate::process::creation::create_user_process(
2608+
String::from("false_test"),
2609+
false_test_elf,
2610+
) {
2611+
Ok(pid) => {
2612+
log::info!("Created false_test process with PID {:?}", pid);
2613+
log::info!("false_test: process scheduled for execution.");
2614+
log::info!(" -> Userspace will emit FALSE_TEST_PASSED marker if successful");
2615+
}
2616+
Err(e) => {
2617+
log::error!("Failed to create false_test process: {}", e);
2618+
log::error!("false_test cannot run without valid userspace process");
2619+
}
2620+
}
2621+
}
2622+
2623+
/// Test the `head` coreutil
2624+
///
2625+
/// Verifies that /bin/head correctly outputs the first N lines of files.
2626+
pub fn test_head_coreutil() {
2627+
log::info!("Testing head coreutil (first N lines)");
2628+
2629+
#[cfg(feature = "testing")]
2630+
let head_test_elf_buf = crate::userspace_test::get_test_binary("head_test");
2631+
#[cfg(feature = "testing")]
2632+
let head_test_elf: &[u8] = &head_test_elf_buf;
2633+
#[cfg(not(feature = "testing"))]
2634+
let head_test_elf = &create_hello_world_elf();
2635+
2636+
match crate::process::creation::create_user_process(
2637+
String::from("head_test"),
2638+
head_test_elf,
2639+
) {
2640+
Ok(pid) => {
2641+
log::info!("Created head_test process with PID {:?}", pid);
2642+
log::info!("head_test: process scheduled for execution.");
2643+
log::info!(" -> Userspace will emit HEAD_TEST_PASSED marker if successful");
2644+
}
2645+
Err(e) => {
2646+
log::error!("Failed to create head_test process: {}", e);
2647+
log::error!("head_test cannot run without valid userspace process");
2648+
}
2649+
}
2650+
}
2651+
2652+
/// Test the `tail` coreutil
2653+
///
2654+
/// Verifies that /bin/tail correctly outputs the last N lines of files.
2655+
pub fn test_tail_coreutil() {
2656+
log::info!("Testing tail coreutil (last N lines)");
2657+
2658+
#[cfg(feature = "testing")]
2659+
let tail_test_elf_buf = crate::userspace_test::get_test_binary("tail_test");
2660+
#[cfg(feature = "testing")]
2661+
let tail_test_elf: &[u8] = &tail_test_elf_buf;
2662+
#[cfg(not(feature = "testing"))]
2663+
let tail_test_elf = &create_hello_world_elf();
2664+
2665+
match crate::process::creation::create_user_process(
2666+
String::from("tail_test"),
2667+
tail_test_elf,
2668+
) {
2669+
Ok(pid) => {
2670+
log::info!("Created tail_test process with PID {:?}", pid);
2671+
log::info!("tail_test: process scheduled for execution.");
2672+
log::info!(" -> Userspace will emit TAIL_TEST_PASSED marker if successful");
2673+
}
2674+
Err(e) => {
2675+
log::error!("Failed to create tail_test process: {}", e);
2676+
log::error!("tail_test cannot run without valid userspace process");
2677+
}
2678+
}
2679+
}
2680+
2681+
/// Test the `wc` coreutil
2682+
///
2683+
/// Verifies that /bin/wc correctly counts lines, words, and bytes.
2684+
pub fn test_wc_coreutil() {
2685+
log::info!("Testing wc coreutil (line/word/byte counts)");
2686+
2687+
#[cfg(feature = "testing")]
2688+
let wc_test_elf_buf = crate::userspace_test::get_test_binary("wc_test");
2689+
#[cfg(feature = "testing")]
2690+
let wc_test_elf: &[u8] = &wc_test_elf_buf;
2691+
#[cfg(not(feature = "testing"))]
2692+
let wc_test_elf = &create_hello_world_elf();
2693+
2694+
match crate::process::creation::create_user_process(
2695+
String::from("wc_test"),
2696+
wc_test_elf,
2697+
) {
2698+
Ok(pid) => {
2699+
log::info!("Created wc_test process with PID {:?}", pid);
2700+
log::info!("wc_test: process scheduled for execution.");
2701+
log::info!(" -> Userspace will emit WC_TEST_PASSED marker if successful");
2702+
}
2703+
Err(e) => {
2704+
log::error!("Failed to create wc_test process: {}", e);
2705+
log::error!("wc_test cannot run without valid userspace process");
2706+
}
2707+
}
2708+
}
2709+
2710+
/// Test the `which` coreutil
2711+
///
2712+
/// Verifies that /bin/which correctly locates commands in PATH.
2713+
pub fn test_which_coreutil() {
2714+
log::info!("Testing which coreutil (command location)");
2715+
2716+
#[cfg(feature = "testing")]
2717+
let which_test_elf_buf = crate::userspace_test::get_test_binary("which_test");
2718+
#[cfg(feature = "testing")]
2719+
let which_test_elf: &[u8] = &which_test_elf_buf;
2720+
#[cfg(not(feature = "testing"))]
2721+
let which_test_elf = &create_hello_world_elf();
2722+
2723+
match crate::process::creation::create_user_process(
2724+
String::from("which_test"),
2725+
which_test_elf,
2726+
) {
2727+
Ok(pid) => {
2728+
log::info!("Created which_test process with PID {:?}", pid);
2729+
log::info!("which_test: process scheduled for execution.");
2730+
log::info!(" -> Userspace will emit WHICH_TEST_PASSED marker if successful");
2731+
}
2732+
Err(e) => {
2733+
log::error!("Failed to create which_test process: {}", e);
2734+
log::error!("which_test cannot run without valid userspace process");
2735+
}
2736+
}
2737+
}

‎scripts/create_ext2_disk.sh‎

Lines changed: 77 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#
44
# This script creates a 4MB ext2 filesystem image with:
55
# - Test files for filesystem testing
6-
# - Coreutils binaries in /bin/ (cat, ls, echo, mkdir, rmdir, rm, cp, mv, true, false, head, tail, wc)
6+
# - Coreutils binaries in /bin/ (cat, ls, echo, mkdir, rmdir, rm, cp, mv, false, head, tail, wc, which)
7+
# - /sbin/true for PATH order testing
78
# - hello_world binary for exec testing
89
#
910
# Requires Docker on macOS (or mke2fs on Linux).
@@ -25,7 +26,7 @@ TESTDATA_FILE="$PROJECT_ROOT/testdata/ext2.img"
2526
SIZE_MB=4
2627

2728
# Coreutils to install in /bin
28-
COREUTILS="cat ls echo mkdir rmdir rm cp mv true false head tail wc"
29+
COREUTILS="cat ls echo mkdir rmdir rm cp mv true false head tail wc which"
2930

3031
echo "Creating ext2 disk image..."
3132
echo " Output: $OUTPUT_FILE"
@@ -71,12 +72,13 @@ if [[ "$(uname)" == "Darwin" ]]; then
7172
mkdir -p /mnt/ext2
7273
mount /work/ext2.img /mnt/ext2
7374
74-
# Create /bin directory for coreutils
75+
# Create /bin and /sbin directories for coreutils
7576
mkdir -p /mnt/ext2/bin
77+
mkdir -p /mnt/ext2/sbin
7678
77-
# Copy coreutils binaries
79+
# Copy coreutils binaries to /bin (excluding true which goes to /sbin)
7880
echo "Installing coreutils in /bin..."
79-
for bin in cat ls echo mkdir rmdir rm cp mv true false head tail wc; do
81+
for bin in cat ls echo mkdir rmdir rm cp mv false head tail wc which; do
8082
if [ -f /binaries/${bin}.elf ]; then
8183
cp /binaries/${bin}.elf /mnt/ext2/bin/${bin}
8284
chmod 755 /mnt/ext2/bin/${bin}
@@ -86,6 +88,16 @@ if [[ "$(uname)" == "Darwin" ]]; then
8688
fi
8789
done
8890
91+
# Install true in /sbin to test PATH lookup order
92+
echo "Installing binaries in /sbin..."
93+
if [ -f /binaries/true.elf ]; then
94+
cp /binaries/true.elf /mnt/ext2/sbin/true
95+
chmod 755 /mnt/ext2/sbin/true
96+
echo " /sbin/true installed"
97+
else
98+
echo " WARNING: true.elf not found in /binaries/"
99+
fi
100+
89101
# Copy hello_world for exec testing
90102
if [ -f /binaries/hello_world.elf ]; then
91103
cp /binaries/hello_world.elf /mnt/ext2/bin/hello_world
@@ -97,13 +109,34 @@ if [[ "$(uname)" == "Darwin" ]]; then
97109
98110
# Create test files for filesystem testing
99111
echo "Hello from ext2!" > /mnt/ext2/hello.txt
112+
echo "Truncate test file" > /mnt/ext2/trunctest.txt
113+
touch /mnt/ext2/empty.txt # Empty file for wc testing
100114
mkdir -p /mnt/ext2/test
101115
echo "Nested file content" > /mnt/ext2/test/nested.txt
102116
103117
# Create additional test content
104118
mkdir -p /mnt/ext2/deep/path/to/file
105119
echo "Deep nested content" > /mnt/ext2/deep/path/to/file/data.txt
106120
121+
# Create multi-line test file for head/tail/wc testing (15 lines)
122+
cat > /mnt/ext2/lines.txt << EOF
123+
Line 1
124+
Line 2
125+
Line 3
126+
Line 4
127+
Line 5
128+
Line 6
129+
Line 7
130+
Line 8
131+
Line 9
132+
Line 10
133+
Line 11
134+
Line 12
135+
Line 13
136+
Line 14
137+
Line 15
138+
EOF
139+
107140
# Show what was created
108141
echo ""
109142
echo "ext2 filesystem contents:"
@@ -143,12 +176,13 @@ else
143176
MOUNT_DIR=$(mktemp -d)
144177
mount "$OUTPUT_FILE" "$MOUNT_DIR"
145178

146-
# Create /bin directory
179+
# Create /bin and /sbin directories
147180
mkdir -p "$MOUNT_DIR/bin"
181+
mkdir -p "$MOUNT_DIR/sbin"
148182

149-
# Copy coreutils binaries
183+
# Copy coreutils binaries to /bin (excluding true which goes to /sbin)
150184
echo "Installing coreutils in /bin..."
151-
for bin in cat ls echo mkdir rmdir rm cp mv true false head tail wc; do
185+
for bin in cat ls echo mkdir rmdir rm cp mv false head tail wc which; do
152186
if [ -f "$USERSPACE_DIR/${bin}.elf" ]; then
153187
cp "$USERSPACE_DIR/${bin}.elf" "$MOUNT_DIR/bin/${bin}"
154188
chmod 755 "$MOUNT_DIR/bin/${bin}"
@@ -158,6 +192,16 @@ else
158192
fi
159193
done
160194

195+
# Install true in /sbin to test PATH lookup order
196+
echo "Installing binaries in /sbin..."
197+
if [ -f "$USERSPACE_DIR/true.elf" ]; then
198+
cp "$USERSPACE_DIR/true.elf" "$MOUNT_DIR/sbin/true"
199+
chmod 755 "$MOUNT_DIR/sbin/true"
200+
echo " /sbin/true installed"
201+
else
202+
echo " WARNING: true.elf not found"
203+
fi
204+
161205
# Copy hello_world for exec testing
162206
if [ -f "$USERSPACE_DIR/hello_world.elf" ]; then
163207
cp "$USERSPACE_DIR/hello_world.elf" "$MOUNT_DIR/bin/hello_world"
@@ -167,11 +211,32 @@ else
167211

168212
# Create test files
169213
echo "Hello from ext2!" > "$MOUNT_DIR/hello.txt"
214+
echo "Truncate test file" > "$MOUNT_DIR/trunctest.txt"
215+
touch "$MOUNT_DIR/empty.txt" # Empty file for wc testing
170216
mkdir -p "$MOUNT_DIR/test"
171217
echo "Nested file content" > "$MOUNT_DIR/test/nested.txt"
172218
mkdir -p "$MOUNT_DIR/deep/path/to/file"
173219
echo "Deep nested content" > "$MOUNT_DIR/deep/path/to/file/data.txt"
174220

221+
# Create multi-line test file for head/tail/wc testing (15 lines)
222+
cat > "$MOUNT_DIR/lines.txt" << EOF
223+
Line 1
224+
Line 2
225+
Line 3
226+
Line 4
227+
Line 5
228+
Line 6
229+
Line 7
230+
Line 8
231+
Line 9
232+
Line 10
233+
Line 11
234+
Line 12
235+
Line 13
236+
Line 14
237+
Line 15
238+
EOF
239+
175240
# Show what was created
176241
echo ""
177242
echo "ext2 filesystem contents:"
@@ -197,10 +262,11 @@ if [[ -f "$OUTPUT_FILE" ]]; then
197262
echo ""
198263
echo "Contents:"
199264
echo " /bin/cat, ls, echo, mkdir, rmdir, rm, cp, mv - file coreutils"
200-
echo " /bin/true, false - exit status coreutils"
201-
echo " /bin/head, tail, wc - text processing coreutils"
265+
echo " /sbin/true, /bin/false - exit status coreutils"
266+
echo " /bin/head, tail, wc, which - text processing coreutils"
202267
echo " /bin/hello_world - exec test binary (exit code 42)"
203-
echo " /hello.txt - test file"
268+
echo " /hello.txt - test file (1 line)"
269+
echo " /lines.txt - multi-line test file (15 lines) for head/tail/wc"
204270
echo " /test/nested.txt - nested test file"
205271
echo " /deep/path/to/file/data.txt - deep nested test file"
206272
else

‎testdata/ext2.img‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)