mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
pc-bios: ensure keymaps dependencies set vnc tests
I was seeing failures on vnc-display-test on FreeBSD: make vm-build-freebsd V=1 TARGET_LIST=aarch64-softmmu BUILD_TARGET=check-qtest QEMU_LOCAL=1 DEBUG=1 Leads to: qemu-system-aarch64: -vnc none: could not read keymap file: 'en-us' Broken pipe ../src/tests/qtest/libqtest.c:196: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) which was as far as I could tell because we don't populate the $BLD/pc-bios/keymaps (although scripts/symlink-install-tree.py attempts to symlink qemu-bundle/usr/local/share/qemu/keymaps/ to that dir). Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20250108121054.1126164-31-alex.bennee@linaro.org>
This commit is contained in:
parent
376c490c1e
commit
1b1e1b0071
2 changed files with 9 additions and 10 deletions
|
@ -39,19 +39,18 @@ else
|
|||
native_qemu_keymap = qemu_keymap
|
||||
endif
|
||||
|
||||
keymap_targets = []
|
||||
if native_qemu_keymap.found()
|
||||
t = []
|
||||
foreach km, args: keymaps
|
||||
# generate with qemu-kvm
|
||||
t += custom_target(km,
|
||||
build_by_default: true,
|
||||
output: km,
|
||||
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
|
||||
install: have_system,
|
||||
install_dir: qemu_datadir / 'keymaps')
|
||||
keymap_targets += custom_target(km,
|
||||
build_by_default: true,
|
||||
output: km,
|
||||
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
|
||||
install: have_system,
|
||||
install_dir: qemu_datadir / 'keymaps')
|
||||
endforeach
|
||||
|
||||
alias_target('update-keymaps', t)
|
||||
alias_target('update-keymaps', keymap_targets)
|
||||
else
|
||||
install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
|
||||
endif
|
||||
|
|
|
@ -383,7 +383,7 @@ qtests = {
|
|||
if vnc.found()
|
||||
gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false)
|
||||
if gvnc.found()
|
||||
qtests += {'vnc-display-test': [gvnc]}
|
||||
qtests += {'vnc-display-test': [gvnc, keymap_targets]}
|
||||
qtests_generic += [ 'vnc-display-test' ]
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue