2ee9abe835
* gnu/packages/virtualization.scm (qemu): Update to 8.1.0. [source] <patches>: Replace qemu-disable-aarch64-migration-test.patch with qemu-disable-some-qtests-tests.patch. <snippet>: Adjust for dtc relocation and meson and sgabios removal. [arguments] <configure-flags>: Remove --meson flag. Remove sgabios from the --firmwarepath value. <phases>: Adjust replace-firmwares and delete-firmwares phases for sgabios removal. [inputs]: Remove sgabios. (qemu-minimal): Use package/inherit, which is more appropriate for a package variant. [arguments]: New disable-extra-tests phase. * gnu/packages/patches/qemu-disable-aarch64-migration-test.patch: Delete file. * gnu/packages/patches/qemu-disable-some-qtests-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Reviewed-by: Kaelyn <kaelyn.alexi@protonmail.com>
53 lines
2.4 KiB
Diff
53 lines
2.4 KiB
Diff
Disable the qtest-aarch64/migration-test, which sometimes fail
|
|
non-deterministically (see:
|
|
https://gitlab.com/qemu-project/qemu/-/issues/1230).
|
|
|
|
Also disable the bios-tables-test, which may fail on older machines (see:
|
|
https://gitlab.com/qemu-project/qemu/-/issues/1098).
|
|
|
|
--- qemu-8.1.0/tests/qtest/meson.build.old 2023-08-30 11:48:27.871146249 -0400
|
|
+++ qemu-8.1.0/tests/qtest/meson.build 2023-08-30 13:53:25.994084948 -0400
|
|
@@ -1,6 +1,5 @@
|
|
slow_qtests = {
|
|
'ahci-test' : 60,
|
|
- 'bios-tables-test' : 120,
|
|
'boot-serial-test' : 60,
|
|
'migration-test' : 150,
|
|
'npcm7xx_pwm-test': 150,
|
|
@@ -81,9 +80,6 @@
|
|
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',
|
|
@@ -212,7 +208,6 @@
|
|
|
|
# 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.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'] : []) + \
|
|
@@ -222,8 +217,7 @@
|
|
config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
|
|
['arm-cpu-features',
|
|
'numa-test',
|
|
- 'boot-serial-test',
|
|
- 'migration-test']
|
|
+ 'boot-serial-test']
|
|
|
|
qtests_s390x = \
|
|
qtests_filter + \
|
|
@@ -301,7 +295,6 @@
|
|
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'),
|