diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-08-12 19:01:49 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-08-12 19:01:49 +0900 |
| commit | 054a8813d795861765c830369f9dc372cf516077 (patch) | |
| tree | 2e77dc2b91d94a2011ffeb40b83b9f1ca8e7db15 /internal | |
| parent | 1bc16b51a68642e1ff2681f71a34e0694468b768 (diff) | |
internal/rosa/package/qemu: disable broken tests
The copy-before-write test was failing on a Haswell machine, although it seems to work pretty reliably on the Zen 3 workstation and RK3588.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/rosa/package/qemu/copy-before-write-spurious.patch | 12 | ||||
| -rw-r--r-- | internal/rosa/package/qemu/iotests-zfs.patch | 16 | ||||
| -rw-r--r-- | internal/rosa/package/qemu/package.az | 8 |
3 files changed, 32 insertions, 4 deletions
diff --git a/internal/rosa/package/qemu/copy-before-write-spurious.patch b/internal/rosa/package/qemu/copy-before-write-spurious.patch new file mode 100644 index 00000000..a47d93f1 --- /dev/null +++ b/internal/rosa/package/qemu/copy-before-write-spurious.patch @@ -0,0 +1,12 @@ +diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotests/tests/copy-before-write +index 236cb8ac37..0eac14005e 100755 +--- a/tests/qemu-iotests/tests/copy-before-write ++++ b/tests/qemu-iotests/tests/copy-before-write +@@ -279,6 +279,7 @@ read 1048576/1048576 bytes at offset 0 + return log + + def test_timeout_break_guest(self): ++ return + log = self.do_cbw_timeout('break-guest-write') + # macOS and FreeBSD tend to represent ETIMEDOUT as + # "Operation timed out", when Linux prefer diff --git a/internal/rosa/package/qemu/iotests-zfs.patch b/internal/rosa/package/qemu/iotests-zfs.patch new file mode 100644 index 00000000..336257fc --- /dev/null +++ b/internal/rosa/package/qemu/iotests-zfs.patch @@ -0,0 +1,16 @@ +diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 +index fab0faa389..d71fb5978d 100755 +--- a/tests/qemu-iotests/150 ++++ b/tests/qemu-iotests/150 +@@ -41,6 +41,11 @@ _supported_fmt raw qcow2 + _supported_proto file + _supported_os Linux + ++# work directory is never an overlay ++if [ "$(stat -fc '%T' /work/)" = "zfs" ]; then ++ _notrun 'fails on zfs' ++fi ++ + + img_size=1048576 + diff --git a/internal/rosa/package/qemu/package.az b/internal/rosa/package/qemu/package.az index 4690fa89..ea24bad2 100644 --- a/internal/rosa/package/qemu/package.az +++ b/internal/rosa/package/qemu/package.az @@ -11,10 +11,14 @@ package qemu { }; patches = [ "meson-colour.patch", + "iotests-zfs.patch", "disable-mcast-test.patch", // fails with ipv6 disabled "disable-netdev-socket.patch", + + // fails on a slower machine + "copy-before-write-spurious.patch", ]; // configure script uses source as scratch space @@ -31,10 +35,6 @@ sed -i \ tests/qemu-iotests/[0-9][0-9][0-9]* \ tests/qemu-iotests/tests/copy-before-write \ tests/qemu-iotests/tests/file-io-error.out -cat << EOF > tests/qemu-iotests/150 -#!/bin/sh -_notrun 'appears to spuriously fail on zfs' -EOF `; exec = make { |