diff options
Diffstat (limited to 'gnu/packages/patches/qemu-disable-bios-tables-test.patch')
| -rw-r--r-- | gnu/packages/patches/qemu-disable-bios-tables-test.patch | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/gnu/packages/patches/qemu-disable-bios-tables-test.patch b/gnu/packages/patches/qemu-disable-bios-tables-test.patch index 39b7b0b53c..ba89b91099 100644 --- a/gnu/packages/patches/qemu-disable-bios-tables-test.patch +++ b/gnu/packages/patches/qemu-disable-bios-tables-test.patch @@ -1,18 +1,17 @@ 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 f096cf3ecd..82f6e1ffeb 100644 +index 2f0d3ef080..e3c33a86b5 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build -@@ -1,7 +1,6 @@ +@@ -1,6 +1,5 @@ slow_qtests = { - 'ahci-test' : 60, 'aspeed_smc-test': 360, -- 'bios-tables-test' : 120, - 'boot-serial-test' : 60, - 'migration-test' : 150, - 'npcm7xx_pwm-test': 150, -@@ -82,9 +81,6 @@ qtests_i386 = \ +- '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'] : []) + \ @@ -22,15 +21,25 @@ index f096cf3ecd..82f6e1ffeb 100644 qtests_pci + \ qtests_cxl + \ ['fdc-test', -@@ -213,7 +209,6 @@ qtests_arm = \ +@@ -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.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ + (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'] : []) + \ -@@ -304,7 +299,6 @@ if gnutls.found() +@@ -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 = { |