[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 8/9] qemu-iotests: support per-format golden outp
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v4 8/9] qemu-iotests: support per-format golden output files |
Date: |
Wed, 5 Apr 2017 16:11:47 +0100 |
Some tests produce format-dependent output. Either the difference is
filtered out and ignored, or the test case is format-specific so we
don't need to worry about per-format output differences.
There is a third case: the test script is the same for all image formats
and the format-dependent output is relevant. An ugly workaround is to
copy-paste the test into multiple per-format test cases. This
duplicates code and is not maintainable.
This patch allows test cases to add per-format golden output files so a
single test case can work correctly when format-dependent output must be
checked:
123.out.qcow2
123.out.raw
123.out.vmdk
...
This naming scheme is not composable with 123.out.nocache or 123.pc.out,
two other scenarios where output files are split. I don't think it
matters since few test cases need these features.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/check | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 4b1c674..29553cf 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -338,6 +338,11 @@ do
reference="$reference_machine"
fi
+ reference_format="$source_iotests/$seq.out.$IMGFMT"
+ if [ -f "$reference_format" ]; then
+ reference="$reference_format"
+ fi
+
if [ "$CACHEMODE" = "none" ]; then
[ -f "$source_iotests/$seq.out.nocache" ] &&
reference="$source_iotests/$seq.out.nocache"
fi
--
2.9.3
- [Qemu-devel] [PATCH v4 2/9] raw-format: add bdrv_measure() support, (continued)
- [Qemu-devel] [PATCH v4 2/9] raw-format: add bdrv_measure() support, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 3/9] qcow2: extract preallocation calculation function, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 4/9] qcow2: make refcount size calculation conservative, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 5/9] qcow2: extract image creation option parsing, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 6/9] qcow2: add bdrv_measure() support, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 7/9] qemu-img: add measure subcommand, Stefan Hajnoczi, 2017/04/05
- [Qemu-devel] [PATCH v4 8/9] qemu-iotests: support per-format golden output files,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v4 9/9] iotests: add test 178 for qemu-img measure, Stefan Hajnoczi, 2017/04/05