diff options
| author | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
| commit | 7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch) | |
| tree | 596f5f71ad597ed951bae98de818cb37f171a18d /scripts/test-msg.sh | |
| parent | fs: /bin alias for the system volume (diff) | |
| download | rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.tar.gz rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.zip | |
scripts: rebuild the dev loop around build.sh/run.sh
`make` did not parse at all (missing separator at line 139), so every
make target was dead. The folder also carried three overlapping
launchers (boot.sh, qemu.sh, boot-image.sh) plus a fourth partial one
in the Makefile, `cargo build --package rsdos` copy-pasted eight times,
the QEMU invocation copy-pasted per script, and the test helpers
(fail/wait_log/wait_qemu_exit/qemu_hmp) duplicated in five tests.
New layout:
- scripts/lib.sh: single config (image, OVMF, mem/smp), the one cargo
invocation (build_all), the one QEMU shape (qemu_args), and the test
harness (test_boot, wait_log, wait_qemu_exit, qemu_hmp, sendkeys)
- scripts/build.sh: kernel + every bins/* in one pass
- scripts/mksystem.sh: freshness-aware image build that now stages
every bins/*.efi into /bin/cli|gui (they were never copied before)
- scripts/run.sh: build + stage + boot in one command; --headless,
--debug (GDB stub), --monitor (HMP socket), --fresh, --mem/--smp/
--bios/--image; on Wayland it auto-selects XWayland plus
grab-on-hover so the mouse can be captured (Ctrl+Alt+G toggles)
- scripts/tests/: the five automated tests on the shared harness
- deleted: boot.sh, qemu.sh, boot-image.sh, lib-boot-args.sh,
build-image-release.sh, build-bootloader.sh (rsboot chain dropped)
The Makefile is now a thin wrapper: make run, make test, make system,
make inspect, make help. Two-command flow: ./scripts/build.sh then
./scripts/run.sh (run.sh alone also works).
Stale test assumptions fixed so the suite is green again: test-gfx
waited for "gfx: check" while the shell prints "gfx check: PASS";
test-mouse/test-msg hardcoded msgrecv = task 3 (wm-input took slot 3 —
ids are parsed from the log now); the queue-full probe targeted task 0,
whose exec pump drains its own queue as completion codes (moved to the
cursor task, which never recvs).
Verified in QEMU: make test -> test-disk, test-gfx, test-mouse,
test-msg, test-fault all PASS.
Diffstat (limited to '')
| -rwxr-xr-x | scripts/test-msg.sh | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/scripts/test-msg.sh b/scripts/test-msg.sh deleted file mode 100755 index ff7fd72..0000000 --- a/scripts/test-msg.sh +++ /dev/null | |||
| @@ -1,140 +0,0 @@ | |||
| 1 | #!/usr/bin/env bash | ||
| 2 | # | ||
| 3 | # scripts/test-msg.sh — automated scheduler message-queue round trip. | ||
| 4 | # | ||
| 5 | # Tests all message types (user, timer, key, mouse), real-input routing, | ||
| 6 | # and queue-full boundary. | ||
| 7 | # | ||
| 8 | # Env: OVMF, QEMU, SYSTEM_IMG | ||
| 9 | # | ||
| 10 | set -euo pipefail | ||
| 11 | |||
| 12 | SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" | ||
| 13 | PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" | ||
| 14 | cd "$PROJECT_DIR" | ||
| 15 | |||
| 16 | OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}" | ||
| 17 | QEMU="${QEMU:-qemu-system-x86_64}" | ||
| 18 | SYSTEM_IMG="${SYSTEM_IMG:-/tmp/system.img}" | ||
| 19 | QPID=/tmp/rsdos-msg-qpid | ||
| 20 | SOCK=/tmp/rsdos-msg-qmon.sock | ||
| 21 | LOG=/tmp/rsdos-msg-serial.log | ||
| 22 | QLOG=/tmp/rsdos-msg-qemu.log | ||
| 23 | |||
| 24 | trap 'kill "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || true' EXIT | ||
| 25 | |||
| 26 | fail() { | ||
| 27 | echo "FAIL: $1" | ||
| 28 | [ -f "$LOG" ] && tail -40 "$LOG" | ||
| 29 | exit 1 | ||
| 30 | } | ||
| 31 | |||
| 32 | wait_log() { | ||
| 33 | local i=0 | ||
| 34 | while [ "$i" -lt $((${3:-60} * 10)) ]; do | ||
| 35 | grep -q "$2" "$1" 2>/dev/null && return 0 | ||
| 36 | sleep 0.1 | ||
| 37 | i=$((i + 1)) | ||
| 38 | done | ||
| 39 | return 1 | ||
| 40 | } | ||
| 41 | |||
| 42 | qemu_hmp() { | ||
| 43 | python3 - "$SOCK" "$1" <<'EOF' | ||
| 44 | import socket, sys, time | ||
| 45 | s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) | ||
| 46 | s.connect(sys.argv[1]) | ||
| 47 | s.sendall((sys.argv[2] + "\n").encode()) | ||
| 48 | time.sleep(0.4) | ||
| 49 | EOF | ||
| 50 | } | ||
| 51 | |||
| 52 | wait_qemu_exit() { | ||
| 53 | local i=0 | ||
| 54 | while [ "$i" -lt $((${1:-30} * 10)) ]; do | ||
| 55 | kill -0 "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || return 0 | ||
| 56 | sleep 0.1 | ||
| 57 | i=$((i + 1)) | ||
| 58 | done | ||
| 59 | return 1 | ||
| 60 | } | ||
| 61 | |||
| 62 | echo "==> 1/5 build kernel (debug)" | ||
| 63 | cargo build --release --package rsdos --target x86_64-unknown-uefi | ||
| 64 | |||
| 65 | echo "==> 2/5 stage system image" | ||
| 66 | "$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG" | ||
| 67 | |||
| 68 | echo "==> 3/5 boot QEMU (headless)" | ||
| 69 | kill "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || true | ||
| 70 | sleep 1 | ||
| 71 | rm -f "$SOCK" "$LOG" | ||
| 72 | "$QEMU" -bios "$OVMF" \ | ||
| 73 | -drive file="$SYSTEM_IMG",format=raw,if=none,id=disk \ | ||
| 74 | -device ide-hd,drive=disk,bus=ide.0 \ | ||
| 75 | -serial file:"$LOG" \ | ||
| 76 | -monitor unix:"$SOCK",server,nowait \ | ||
| 77 | -m 256M -machine q35 -cpu qemu64 -no-reboot -display none \ | ||
| 78 | >"$QLOG" 2>&1 & | ||
| 79 | echo $! >"$QPID" | ||
| 80 | |||
| 81 | wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell" | ||
| 82 | |||
| 83 | echo "==> 4/5 drive the shell (msgrecv / send / mouse routing / queue-full)" | ||
| 84 | python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" \ | ||
| 85 | "msgrecv" \ | ||
| 86 | "send 3 user 42" \ | ||
| 87 | "send 3 timer" \ | ||
| 88 | "send 3 key enter" \ | ||
| 89 | "send 3 key ctrl-c" \ | ||
| 90 | "send 3 key f3" \ | ||
| 91 | "send 3 mouse 5 -3 3" \ | ||
| 92 | "sleep 800" \ | ||
| 93 | "jobs" | ||
| 94 | |||
| 95 | python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" "mouse 3" | ||
| 96 | qemu_hmp "mouse_move 20 7" | ||
| 97 | qemu_hmp "mouse_button 1" | ||
| 98 | qemu_hmp "mouse_move -5 -3" | ||
| 99 | qemu_hmp "mouse_button 0" | ||
| 100 | qemu_hmp "sendkey ctrl-c" | ||
| 101 | |||
| 102 | python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" \ | ||
| 103 | "send 0 user 1" \ | ||
| 104 | "send 0 user 2" \ | ||
| 105 | "send 0 user 3" \ | ||
| 106 | "send 0 user 4" \ | ||
| 107 | "send 0 user 5" \ | ||
| 108 | "send 0 user 6" \ | ||
| 109 | "send 0 user 7" \ | ||
| 110 | "send 0 user 8" \ | ||
| 111 | "send 0 user 9" \ | ||
| 112 | "send 0 user 10" \ | ||
| 113 | "send 0 user 11" \ | ||
| 114 | "send 0 user 12" \ | ||
| 115 | "send 0 user 13" \ | ||
| 116 | "send 0 user 14" \ | ||
| 117 | "send 0 user 15" \ | ||
| 118 | "send 0 user 16" \ | ||
| 119 | "send 0 user 17" \ | ||
| 120 | "sleep 800" \ | ||
| 121 | "jobs" \ | ||
| 122 | "poweroff" | ||
| 123 | |||
| 124 | echo "==> 5/5 wait for shutdown + verify" | ||
| 125 | wait_qemu_exit 30 || fail "QEMU did not exit after poweroff" | ||
| 126 | |||
| 127 | grep -aq "msgrecv: task 3 listening" "$LOG" || fail "msgrecv did not spawn" | ||
| 128 | grep -aq "msgrecv\[3\]: User(42)" "$LOG" || fail "user message missing" | ||
| 129 | grep -aq "msgrecv\[3\]: Timer" "$LOG" || fail "timer message missing" | ||
| 130 | grep -aq "msgrecv\[3\]: Key(Enter)" "$LOG" || fail "key enter missing" | ||
| 131 | grep -aq "msgrecv\[3\]: Key(Ctrl-c)" "$LOG" || fail "key ctrl-c missing" | ||
| 132 | grep -aq "msgrecv\[3\]: Key(F3)" "$LOG" || fail "key f3 missing" | ||
| 133 | grep -aq "msgrecv\[3\]: Mouse(+5,-3 L R)" "$LOG" || fail "synthesized mouse message missing" | ||
| 134 | grep -aq "msgrecv\[3\]: Mouse(+20,+7" "$LOG" || fail "real mouse move 20,7 not routed to queue" | ||
| 135 | grep -aq "msgrecv\[3\]: Mouse(-5,-3 L" "$LOG" || fail "held-button routed move missing" | ||
| 136 | grep -aq "queue full" "$LOG" || fail "17th send did not report queue full" | ||
| 137 | grep -aq "send: unknown type" "$LOG" && fail "a bad send slipped through (expected none)" | ||
| 138 | |||
| 139 | echo "" | ||
| 140 | echo "PASS — message queues OK" | ||
