diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-08-30 14:05:22 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-05 23:30:02 -0400 |
| commit | 2ee9abe835affc2846670165998a68333a7b916b (patch) | |
| tree | 258d4d7fd893c3782462ab376c99368a6da973f5 /gnu/packages/patches/qemu-disable-some-qtests-tests.patch | |
| parent | 73958f7f046f578124208015f17d6dc89cb785cf (diff) | |
| download | guix-2ee9abe835affc2846670165998a68333a7b916b.tar.gz | |
gnu: qemu: Update to 8.1.0.
* 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>
Diffstat (limited to 'gnu/packages/patches/qemu-disable-some-qtests-tests.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-disable-some-qtests-tests.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/gnu/packages/patches/qemu-disable-some-qtests-tests.patch b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch new file mode 100644 index 0000000000..f60698de8f --- /dev/null +++ b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch @@ -0,0 +1,52 @@ +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'), |