mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
0260cf87dc
* gnu/packages/virtualization.scm (qemu): Update to 10.1.0. [source] <patches>: Remove qemu-disable-bios-tables-test and qemu-glibc-2.41.patch patches; add qemu-fix-test-virtio-version.patch. * gnu/packages/patches/qemu-disable-bios-tables-test.patch: Rebase. * gnu/packages/patches/qemu-disable-migration-test.patch: Delete file. * gnu/packages/patches/qemu-glibc-2.41.patch: Likewise. * gnu/packages/patches/qemu-fix-test-virtio-version.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: I0203137a144f89dcc502d1bcb2fa6f717b7223ff
56 lines
2.8 KiB
Diff
56 lines
2.8 KiB
Diff
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
|
|
index 669d07c06b..3399c1043a 100644
|
|
--- a/tests/qtest/meson.build
|
|
+++ b/tests/qtest/meson.build
|
|
@@ -1,7 +1,6 @@
|
|
slow_qtests = {
|
|
'ahci-test': 150,
|
|
'aspeed_smc-test': 360,
|
|
- 'bios-tables-test' : 910,
|
|
'cdrom-test' : 610,
|
|
'device-introspect-test' : 720,
|
|
'ide-test' : 120,
|
|
@@ -102,9 +101,6 @@ qtests_i386 = \
|
|
config_all_devices.has_key('CONFIG_Q35') and \
|
|
config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \
|
|
slirp.found() ? ['virtio-net-failover'] : []) + \
|
|
- (unpack_edk2_blobs and \
|
|
- config_all_devices.has_key('CONFIG_HPET') and \
|
|
- config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \
|
|
qtests_pci + \
|
|
qtests_cxl + \
|
|
[
|
|
@@ -148,7 +144,6 @@ qtests_hppa = \
|
|
|
|
qtests_loongarch64 = qtests_filter + \
|
|
(config_all_devices.has_key('CONFIG_LOONGARCH_VIRT') ? ['numa-test'] : []) + \
|
|
- (unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
|
|
['boot-serial-test',
|
|
'cpu-plug-test']
|
|
|
|
@@ -253,7 +248,6 @@ qtests_arm = \
|
|
|
|
# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
|
|
qtests_aarch64 = \
|
|
- (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
|
|
(config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \
|
|
['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \
|
|
(config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
|
|
@@ -281,8 +275,7 @@ qtests_s390x = \
|
|
qtests_riscv32 = \
|
|
(config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
|
|
|
|
-qtests_riscv64 = ['riscv-csr-test'] + \
|
|
- (unpack_edk2_blobs ? ['bios-tables-test'] : [])
|
|
+qtests_riscv64 = ['riscv-csr-test']
|
|
|
|
qos_test_ss = ss.source_set()
|
|
qos_test_ss.add(
|
|
@@ -371,7 +364,6 @@ qtests = {
|
|
'aspeed_smc-test': files('aspeed-smc-utils.c', 'aspeed_smc-test.c'),
|
|
'ast2700-hace-test': files('aspeed-hace-utils.c', 'ast2700-hace-test.c'),
|
|
'ast2700-smc-test': files('aspeed-smc-utils.c', 'ast2700-smc-test.c'),
|
|
- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
|
|
'cdrom-test': files('boot-sector.c'),
|
|
'dbus-vmstate-test': files('migration/migration-qmp.c',
|
|
'migration/migration-util.c') + dbus_vmstate1,
|