Federated_Computer/Coredesktop-Dev
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install QEMU's virtio-vga display and check for it

Browse Source 
The smoketest VMs start with -vga virtio, but Arch packages that display
apart from qemu-base, so the base image build failed with "Virtio VGA not
available". update.sh now installs qemu-hw-display-virtio-vga, and doctor
and smoketest run check QEMU has the display before anything downloads.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
david
2026-11-04 20:04:39 -07:00
co-authored by Claude Opus 5.5
parent b41b70619d
commit 2207208326
8 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/smoketest.bats
+13 -3
View File
@@ -18,7 +18,8 @@ setup() {
git -C "$WC" rev-parse HEAD > "$STATE/images/installed.ref"
# A VM is a sleep that lets go of bats' output pipes
stub qemu-system-x86_64 'while [ $# -gt 0 ]; do [ "$1" = -pidfile ] && pidfile="$2"; shift; done
stub qemu-system-x86_64 '[ "$*" = "-device help" ] && { echo "name \"virtio-vga\", bus PCI"; exit; }
while [ $# -gt 0 ]; do [ "$1" = -pidfile ] && pidfile="$2"; shift; done
/usr/bin/sleep 300 > /dev/null 2>&1 3>&- &
echo $! > "$pidfile"'
stub qemu-img 'touch "${@: -1}"'
@@ -98,7 +99,16 @@ last_run() {
run cdd smoketest run 10 nosuch
[ "$status" -eq 1 ]
[[ "$output" == *"No scenario called nosuch"* ]]
not_called qemu-system-x86_64
# Only the check for the virtio-vga display, no VM
[ -z "$(grep '^qemu-system-x86_64 ' "$STUB_LOG" | grep -v -- '-device help')" ]
}
@test "run stops before any VM when QEMU has no virtio-vga display" {
stub qemu-system-x86_64 'echo "name \"VGA\", bus PCI"'
run cdd smoketest run 10
[ "$status" -eq 1 ]
[[ "$output" == *"QEMU has no virtio-vga display"* ]]
[ "$(grep -c '^qemu-system-x86_64 ' "$STUB_LOG")" -eq 1 ]
}
@test "each variant runs in its own VM" {
@@ -106,7 +116,7 @@ last_run() {
[ "$status" -eq 0 ]
[[ "$output" == *"PASS 30-variants @ one"* ]]
[[ "$output" == *"PASS 30-variants @ two"* ]]
[ "$(grep -c '^qemu-system-x86_64 ' "$STUB_LOG")" -eq 2 ]
[ "$(grep '^qemu-system-x86_64 ' "$STUB_LOG" | grep -vc -- '-device help')" -eq 2 ]
grep -q "variant two" "$(last_run)/30-variants@two/scenario.log"
}