From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Nir Soffer <nsoffer@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Maor Lipchuk <mlipchuk@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
Eric Blake <eblake@redhat.com>, Alberto Garcia <berto@igalia.com>,
John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v6 8/9] qemu-iotests: support per-format golden output files
Date: Mon, 8 May 2017 10:15:35 -0400 [thread overview]
Message-ID: <20170508141536.20690-9-stefanha@redhat.com> (raw)
In-Reply-To: <20170508141536.20690-1-stefanha@redhat.com>
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 <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
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
next prev parent reply other threads:[~2017-05-08 14:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 14:15 [Qemu-devel] [PATCH v6 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 1/9] block: add bdrv_measure() API Stefan Hajnoczi
2017-05-08 14:50 ` Eric Blake
2017-05-09 15:28 ` Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 2/9] raw-format: add bdrv_measure() support Stefan Hajnoczi
2017-05-08 14:52 ` Eric Blake
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 3/9] qcow2: extract preallocation calculation function Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 4/9] qcow2: make refcount size calculation conservative Stefan Hajnoczi
2017-05-08 15:00 ` Eric Blake
2017-05-08 19:06 ` Max Reitz
2017-05-08 21:26 ` Max Reitz
2017-05-09 15:32 ` Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 5/9] qcow2: extract image creation option parsing Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 6/9] qcow2: add bdrv_measure() support Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 7/9] qemu-img: add measure subcommand Stefan Hajnoczi
2017-06-12 10:00 ` Alberto Garcia
2017-06-13 9:09 ` Stefan Hajnoczi
2017-05-08 14:15 ` Stefan Hajnoczi [this message]
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 9/9] iotests: add test 178 for qemu-img measure Stefan Hajnoczi
2017-05-24 12:59 ` [Qemu-devel] [PATCH v6 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-06-12 9:29 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170508141536.20690-9-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=berto@igalia.com \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mlipchuk@redhat.com \
--cc=nsoffer@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).