summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/test-gfx.sh2
-rwxr-xr-xscripts/test-mouse.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/test-gfx.sh b/scripts/test-gfx.sh
index a6e4016..7bee4ee 100755
--- a/scripts/test-gfx.sh
+++ b/scripts/test-gfx.sh
@@ -85,7 +85,7 @@ rm -f "$SOCK" "$LOG"
85echo $! >"$QPID" 85echo $! >"$QPID"
86 86
87wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell" 87wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell"
88grep -aq "cursor: task " "$LOG" || fail "cursor task did not spawn" 88wait_log "$LOG" "cursor: task " 10 || fail "cursor task did not spawn"
89 89
90echo "==> 4/5 in-kernel pixel self-test (gfx check)" 90echo "==> 4/5 in-kernel pixel self-test (gfx check)"
91python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" \ 91python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" \
diff --git a/scripts/test-mouse.sh b/scripts/test-mouse.sh
index e58d474..ea58f91 100755
--- a/scripts/test-mouse.sh
+++ b/scripts/test-mouse.sh
@@ -95,7 +95,7 @@ echo $! >"$QPID"
95 95
96wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell" 96wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell"
97grep -aq "ps2: mouse ready" "$LOG" || fail "mouse driver did not come up at boot" 97grep -aq "ps2: mouse ready" "$LOG" || fail "mouse driver did not come up at boot"
98grep -aq "cursor: task " "$LOG" || fail "cursor task did not spawn" 98wait_log "$LOG" "cursor: task " 10 || fail "cursor task did not spawn"
99 99
100echo "==> 4/6 cursor position tracks injected movement" 100echo "==> 4/6 cursor position tracks injected movement"
101INIT=$(cursor_state) 101INIT=$(cursor_state)
@@ -153,7 +153,7 @@ qemu_hmp "sendkey ctrl-c"
153grep -aq "mouse: routing events to task 3" "$LOG" || fail "mouse 3 did not arm routing" 153grep -aq "mouse: routing events to task 3" "$LOG" || fail "mouse 3 did not arm routing"
154grep -aq "msgrecv\[3\]: Mouse(+" "$LOG" || fail "task 3 queue did not receive the routed Mouse event" 154grep -aq "msgrecv\[3\]: Mouse(+" "$LOG" || fail "task 3 queue did not receive the routed Mouse event"
155# Watch line: x/y/buttons format (any occurrence after watching started). 155# Watch line: x/y/buttons format (any occurrence after watching started).
156grep -aq "mouse: x=$((X3 + 3)) y=$((Y3 + 2)) buttons=---" "$LOG" || fail "watch did not print the moved cursor (x=$((X3+3)) y=$((Y3+2)))" 156grep -aq "mouse: x=$((X3 + 3)) y=$((Y3 + 2)) buttons=---" "$LOG" || fail "watch did not print the moved cursor (x=$((X3 + 3)) y=$((Y3 + 2)))"
157grep -aq "mouse: stopped" "$LOG" || fail "^C did not stop the mouse watch" 157grep -aq "mouse: stopped" "$LOG" || fail "^C did not stop the mouse watch"
158 158
159python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" "poweroff" 159python3 "$SCRIPT_DIR/sendkeys.py" --sock "$SOCK" "poweroff"