[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 5/5] tests: qtest: bios-tables-test depends on the unpacked edk
From: |
Paolo Bonzini |
Subject: |
[PULL v2 5/5] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs |
Date: |
Sun, 26 Sep 2021 13:17:08 -0400 |
Skip the test if bzip2 is not available, and run it after they are
uncompressed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/meson.build | 3 ++-
tests/qtest/meson.build | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index a3b3d87891..a44c9bc127 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -1,3 +1,4 @@
+roms = []
if unpack_edk2_blobs
fds = [
'edk2-aarch64-code.fd',
@@ -11,7 +12,7 @@ if unpack_edk2_blobs
]
foreach f : fds
- custom_target(f,
+ roms += custom_target(f,
build_by_default: have_system,
output: f,
input: '@0@.bz2'.format(f),
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e1f4df3df8..c9d8458062 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -68,12 +68,12 @@ qtests_i386 = \
(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_ESP_PCI') ? ['am53c974-test'] : []) +
\
+ (unpack_edk2_blobs ? ['bios-tables-test'] : []) +
\
qtests_pci +
\
['fdc-test',
'ide-test',
'hd-geo-test',
'boot-order-test',
- 'bios-tables-test',
'rtc-test',
'i440fx-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
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-swtpm-test'] : []) + \
['arm-cpu-features',
@@ -269,7 +269,7 @@ foreach dir : target_dirs
qtest_emulator = emulators['qemu-system-' + target_base]
target_qtests = get_variable('qtests_' + target_base, []) + qtests_generic
- test_deps = []
+ test_deps = roms
qtest_env = environment()
if have_tools
qtest_env.set('QTEST_QEMU_IMG', './qemu-img')
--
2.27.0
- [PULL v2 0/5] Update meson version, Paolo Bonzini, 2021/09/26
- [PULL v2 1/5] meson: bump submodule to 0.58.2, Paolo Bonzini, 2021/09/26
- [PULL v2 3/5] hexagon: use env keyword argument to pass PYTHONPATH, Paolo Bonzini, 2021/09/26
- [PULL v2 2/5] meson: switch minimum meson version to 0.58.2, Paolo Bonzini, 2021/09/26
- [PULL v2 5/5] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs,
Paolo Bonzini <=
- [PULL v2 4/5] meson: unpack edk2 firmware even if --disable-blobs, Paolo Bonzini, 2021/09/26
- Re: [PULL v2 0/5] Update meson version, Peter Maydell, 2021/09/26