motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 15:12:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs

Browse source 
Skip the test if bzip2 is not available, and run it after they are
uncompressed.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210923105529.3845741-2-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-09-23 06:55:29 -04:00
parent e49c0ef6f1
commit 809954efc2
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pc-bios/meson.build
View file

@ -1,3 +1,4 @@
roms = []
if unpack_edk2_blobs if unpack_edk2_blobs
fds = [ fds = [
'edk2-aarch64-code.fd', 'edk2-aarch64-code.fd',
@ -11,7 +12,7 @@ if unpack_edk2_blobs
] ]
foreach f : fds foreach f : fds
custom_target(f, roms += custom_target(f,
build_by_default: have_system, build_by_default: have_system,
output: f, output: f,
input: '@0@.bz2'.format(f), input: '@0@.bz2'.format(f),

6
tests/qtest/meson.build
View file

@ -68,12 +68,12 @@ qtests_i386 = \
(config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : []) + \
(config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? ['fuzz-e1000e-test'] : []) + \ (config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? ['fuzz-e1000e-test'] : []) + \
(config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \
(unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
qtests_pci + \ qtests_pci + \
['fdc-test', ['fdc-test',
'ide-test', 'ide-test',
'hd-geo-test', 'hd-geo-test',
'boot-order-test', 'boot-order-test',
'bios-tables-test',
'rtc-test', 'rtc-test',
'i440fx-test', 'i440fx-test',
'fw_cfg-test', 'fw_cfg-test',
@ -180,7 +180,7 @@ qtests_arm = \
# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
qtests_aarch64 = \ qtests_aarch64 = \
(cpu != 'arm' ? ['bios-tables-test'] : []) + \ (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
['arm-cpu-features', ['arm-cpu-features',
@ -269,7 +269,7 @@ foreach dir : target_dirs
qtest_emulator = emulators['qemu-system-' + target_base] qtest_emulator = emulators['qemu-system-' + target_base]
target_qtests = get_variable('qtests_' + target_base, []) + qtests_generic target_qtests = get_variable('qtests_' + target_base, []) + qtests_generic
test_deps = [] test_deps = roms
qtest_env = environment() qtest_env = environment()
if have_tools if have_tools
qtest_env.set('QTEST_QEMU_IMG', './qemu-img') qtest_env.set('QTEST_QEMU_IMG', './qemu-img')