mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-13 10:30:43 +02:00
4a1ea5d0da
* gnu/packages/virtualization.scm (qemu): Update to 9.1.3. [source] <patches>: Add qemu-disable-migration-test.patch. [arguments] <phases>: Adjust install-user-static phase. [native-inputs]: Add python-tomli. (qemu-patch): Delete procedure. * gnu/packages/patches/qemu-disable-bios-tables-test.patch: Rebase. * gnu/packages/patches/qemu-fix-agent-paths.patch: Likewise. * gnu/packages/patches/qemu-disable-aarch64-migration-test.patch: Delete file. * gnu/packages/patches/qemu-disable-migration-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Change-Id: I573070a297ffc9ca096c52e2fa18f839ad89a24e
49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
The bios-tables-test may fail; disable it (see: https://gitlab.com/qemu-project/qemu/-/issues/1098)
|
|
|
|
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
|
|
index 2f0d3ef080..e3c33a86b5 100644
|
|
--- a/tests/qtest/meson.build
|
|
+++ b/tests/qtest/meson.build
|
|
@@ -1,6 +1,5 @@
|
|
slow_qtests = {
|
|
'aspeed_smc-test': 360,
|
|
- 'bios-tables-test' : 910,
|
|
'cdrom-test' : 610,
|
|
'device-introspect-test' : 720,
|
|
'migration-test' : 480,
|
|
@@ -86,9 +85,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 + \
|
|
['fdc-test',
|
|
@@ -235,7 +231,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'] : []) + \
|
|
@@ -260,9 +255,6 @@ qtests_s390x = \
|
|
qtests_riscv32 = \
|
|
(config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
|
|
|
|
-qtests_riscv64 = \
|
|
- (unpack_edk2_blobs ? ['bios-tables-test'] : [])
|
|
-
|
|
qos_test_ss = ss.source_set()
|
|
qos_test_ss.add(
|
|
'ac97-test.c',
|
|
@@ -328,7 +320,6 @@ if gnutls.found()
|
|
endif
|
|
|
|
qtests = {
|
|
- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'],
|
|
'cdrom-test': files('boot-sector.c'),
|
|
'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
|
|
'erst-test': files('erst-test.c'),
|