motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc-bios: ensure keymaps dependencies set vnc tests

Browse source 
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:
Alex Bennée 2025-01-08 12:10:52 +00:00
parent 376c490c1e
commit 1b1e1b0071
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pc-bios/keymaps/meson.build
View file

@ -39,19 +39,18 @@ else
native_qemu_keymap = qemu_keymap native_qemu_keymap = qemu_keymap
endif endif
keymap_targets = []
if native_qemu_keymap.found() if native_qemu_keymap.found()
t = []
foreach km, args: keymaps foreach km, args: keymaps
# generate with qemu-kvm # generate with qemu-kvm
t += custom_target(km, keymap_targets += custom_target(km,
build_by_default: true, build_by_default: true,
output: km, output: km,
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
install: have_system, install: have_system,
install_dir: qemu_datadir / 'keymaps') install_dir: qemu_datadir / 'keymaps')
endforeach endforeach
alias_target('update-keymaps', keymap_targets)
alias_target('update-keymaps', t)
else else
install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
endif endif

2
tests/qtest/meson.build
View file

@ -383,7 +383,7 @@ qtests = {
if vnc.found() if vnc.found()
gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false) gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false)
if gvnc.found() if gvnc.found()
qtests += {'vnc-display-test': [gvnc]} qtests += {'vnc-display-test': [gvnc, keymap_targets]}
qtests_generic += [ 'vnc-display-test' ] qtests_generic += [ 'vnc-display-test' ]
endif endif
endif endif