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 'scripts/tests/test-focus.py')
| -rwxr-xr-x | scripts/tests/test-focus.py | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/scripts/tests/test-focus.py b/scripts/tests/test-focus.py new file mode 100755 index 0000000..cfa317a --- /dev/null +++ b/scripts/tests/test-focus.py | |||
| @@ -0,0 +1,57 @@ | |||
| 1 | #!/usr/bin/env python3 | ||
| 2 | """Drive the focus-routing gate: 3 windows, type markers, verify routing. | ||
| 3 | |||
| 4 | Connects to the QEMU monitor once and keeps the socket open (the per-call | ||
| 5 | sendkeys.py pattern loses the socket when the monitor resets). | ||
| 6 | |||
| 7 | Usage: start the guest with `./scripts/run.sh --monitor`, then | ||
| 8 | python3 scripts/tests/test-focus.py [/tmp/rsdos-monitor.sock] | ||
| 9 | """ | ||
| 10 | import socket | ||
| 11 | import sys | ||
| 12 | import time | ||
| 13 | |||
| 14 | sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) | ||
| 15 | sock.connect(sys.argv[1] if len(sys.argv) > 1 else "/tmp/rsdos-monitor.sock") | ||
| 16 | |||
| 17 | |||
| 18 | def sk(k, d=0.35): | ||
| 19 | sock.sendall(f"sendkey {k}\n".encode()) | ||
| 20 | time.sleep(d) | ||
| 21 | |||
| 22 | |||
| 23 | def line(txt, d=0.8): | ||
| 24 | for ch in txt: | ||
| 25 | if ch == " ": | ||
| 26 | sk("spc", 0.1) | ||
| 27 | elif ch.isupper(): | ||
| 28 | sk("shift-" + ch.lower(), 0.12) | ||
| 29 | else: | ||
| 30 | sk(ch, 0.12) | ||
| 31 | sk("ret", d) | ||
| 32 | |||
| 33 | |||
| 34 | time.sleep(0.5) | ||
| 35 | |||
| 36 | # Home is focused at boot. | ||
| 37 | line("windows") # expect: home + nothing (or existing windows) | ||
| 38 | time.sleep(1.5) | ||
| 39 | |||
| 40 | # F1 -> term1 (focused on creation) | ||
| 41 | sk("f1", 1.5) | ||
| 42 | line("echo TERM1MARK") | ||
| 43 | time.sleep(1.0) | ||
| 44 | |||
| 45 | # F1 -> term2 (focused on creation) | ||
| 46 | sk("f1", 1.5) | ||
| 47 | line("echo TERM2MARK") | ||
| 48 | time.sleep(1.0) | ||
| 49 | |||
| 50 | # F2 cycles z-order: term2 -> term1 | ||
| 51 | sk("f2", 0.8) | ||
| 52 | line("echo CYCLED") | ||
| 53 | time.sleep(1.0) | ||
| 54 | |||
| 55 | # F2 again: term1 -> home (window 0, oldest) | ||
| 56 | sk("f2", 0.8) | ||
| 57 | line("windows") | ||
