summaryrefslogtreecommitdiffstats
path: root/scripts/test-gfx.sh
diff options
context:
space:
mode:
authorsalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
committersalmonik <salmonik@tuta.io>2026-11-01 15:53:29 +0100
commit7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch)
tree596f5f71ad597ed951bae98de818cb37f171a18d /scripts/test-gfx.sh
parentfs: /bin alias for the system volume (diff)
downloadrs-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 'scripts/test-gfx.sh')
-rwxr-xr-xscripts/test-gfx.sh84
1 files changed, 0 insertions, 84 deletions
diff --git a/scripts/test-gfx.sh b/scripts/test-gfx.sh
deleted file mode 100755
index 1c7f9ac..0000000
--- a/scripts/test-gfx.sh
+++ /dev/null
@@ -1,84 +0,0 @@
1#!/usr/bin/env bash
2#
3# scripts/test-gfx.sh — automated graphics round-trip test.
4#
5# Builds kernel, boots headless, runs the in-kernel gfx self-test and
6# the draw/paint demo.
7#
8# Env: OVMF, QEMU, SYSTEM_IMG
9#
10set -euo pipefail
11
12SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
13PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
14cd "$PROJECT_DIR"
15
16OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}"
17QEMU="${QEMU:-qemu-system-x86_64}"
18SYSTEM_IMG="${SYSTEM_IMG:-/tmp/system.img}"
19QPID=/tmp/rsdos-gfx-qpid
20SOCK=/tmp/rsdos-gfx-qmon.sock
21LOG=/tmp/rsdos-gfx-serial.log
22QLOG=/tmp/rsdos-gfx-qemu.log
23
24trap 'kill "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || true' EXIT
25
26fail() {
27 echo "FAIL: $1"
28 [ -f "$LOG" ] && tail -40 "$LOG"
29 exit 1
30}
31
32wait_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
42echo "==> 1/5 build kernel (debug)"
43cargo build --release --package rsdos --target x86_64-unknown-uefi
44
45echo "==> 2/5 stage system image"
46"$SCRIPT_DIR/mksystem.sh" --force "$SYSTEM_IMG"
47
48echo "==> 3/5 boot QEMU (headless)"
49kill "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || true
50sleep 1
51rm -f "$SOCK" "$LOG"
52"$QEMU" -bios "$OVMF" \
53 -drive file="$SYSTEM_IMG",format=raw,if=none,id=disk \
54 -device ide-hd,drive=disk,bus=ide.0 \
55 -serial file:"$LOG" \
56 -monitor unix:"$SOCK",server,nowait \
57 -m 256M -machine q35 -cpu qemu64 -no-reboot -display none \
58 >"$QLOG" 2>&1 &
59echo $! >"$QPID"
60
61wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell"
62wait_log "$LOG" "cursor: task " 10 || fail "cursor task did not spawn"
63
64echo "==> 4/5 in-kernel pixel self-test (gfx check)"
65python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" "gfx check"
66wait_log "$LOG" "gfx: check" 30 || fail "gfx check did not run"
67
68echo "==> 5/5 gfx demo (draw scene)"
69python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" "gfx" "poweroff"
70wait_qemu_exit() {
71 local i=0
72 while [ "$i" -lt $((${1:-30} * 10)) ]; do
73 kill -0 "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || return 0
74 sleep 0.1
75 i=$((i + 1))
76 done
77 return 1
78}
79wait_qemu_exit 30 || fail "QEMU did not exit after poweroff"
80
81grep -aq "gfx: drew status bar" "$LOG" || fail "gfx demo did not draw"
82
83echo ""
84echo "PASS — gfx round trip"