From 7958276c9f0d230053520ba20f2a00f5ecda18e4 Mon Sep 17 00:00:00 2001 From: salmonik Date: Sun, 1 Nov 2026 15:53:29 +0100 Subject: scripts: rebuild the dev loop around build.sh/run.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `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. --- scripts/test-focus.py | 56 --------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100755 scripts/test-focus.py (limited to 'scripts/test-focus.py') diff --git a/scripts/test-focus.py b/scripts/test-focus.py deleted file mode 100755 index e1bbe2d..0000000 --- a/scripts/test-focus.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python3 -"""Drive the focus-routing gate: 3 windows, type markers, verify routing. - -Connects to the QEMU monitor once and keeps the socket open (the per-call -scripts/sendkeys.py pattern loses the socket when the monitor resets). - -Usage: python3 scripts/test-focus.py /tmp/qmon.sock -""" -import socket -import sys -import time - -sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) -sock.connect(sys.argv[1] if len(sys.argv) > 1 else "/tmp/sysboot-mon.sock") - - -def sk(k, d=0.35): - sock.sendall(f"sendkey {k}\n".encode()) - time.sleep(d) - - -def line(txt, d=0.8): - for ch in txt: - if ch == " ": - sk("spc", 0.1) - elif ch.isupper(): - sk("shift-" + ch.lower(), 0.12) - else: - sk(ch, 0.12) - sk("ret", d) - - -time.sleep(0.5) - -# Home is focused at boot. -line("windows") # expect: home + nothing (or existing windows) -time.sleep(1.5) - -# F1 -> term1 (focused on creation) -sk("f1", 1.5) -line("echo TERM1MARK") -time.sleep(1.0) - -# F1 -> term2 (focused on creation) -sk("f1", 1.5) -line("echo TERM2MARK") -time.sleep(1.0) - -# F2 cycles z-order: term2 -> term1 -sk("f2", 0.8) -line("echo CYCLED") -time.sleep(1.0) - -# F2 again: term1 -> home (window 0, oldest) -sk("f2", 0.8) -line("windows") -- cgit v1.2.3