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/tests/test-focus.py | |
| 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/tests/test-focus.py (renamed from scripts/test-focus.py) | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/test-focus.py b/scripts/tests/test-focus.py index e1bbe2d..cfa317a 100755 --- a/scripts/test-focus.py +++ b/scripts/tests/test-focus.py | |||
| @@ -2,16 +2,17 @@ | |||
| 2 | """Drive the focus-routing gate: 3 windows, type markers, verify routing. | 2 | """Drive the focus-routing gate: 3 windows, type markers, verify routing. |
| 3 | 3 | ||
| 4 | Connects to the QEMU monitor once and keeps the socket open (the per-call | 4 | Connects to the QEMU monitor once and keeps the socket open (the per-call |
| 5 | scripts/sendkeys.py pattern loses the socket when the monitor resets). | 5 | sendkeys.py pattern loses the socket when the monitor resets). |
| 6 | 6 | ||
| 7 | Usage: python3 scripts/test-focus.py /tmp/qmon.sock | 7 | Usage: start the guest with `./scripts/run.sh --monitor`, then |
| 8 | python3 scripts/tests/test-focus.py [/tmp/rsdos-monitor.sock] | ||
| 8 | """ | 9 | """ |
| 9 | import socket | 10 | import socket |
| 10 | import sys | 11 | import sys |
| 11 | import time | 12 | import time |
| 12 | 13 | ||
| 13 | sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) | 14 | sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) |
| 14 | sock.connect(sys.argv[1] if len(sys.argv) > 1 else "/tmp/sysboot-mon.sock") | 15 | sock.connect(sys.argv[1] if len(sys.argv) > 1 else "/tmp/rsdos-monitor.sock") |
| 15 | 16 | ||
| 16 | 17 | ||
| 17 | def sk(k, d=0.35): | 18 | def sk(k, d=0.35): |
