On 15.03.2017 10:29, Stefan Hajnoczi wrote: > 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.
Well, it would be pretty simple to implement by just always using reference_x="$reference.$NEW_EXTENSION" instead of rebuilding the path from screatch, but the number of combinations would blow up so much it may be better to leave that out anyway. (No R-b because I like to save my precious R-bs for non-RFCs) Max > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.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 >
signature.asc
Description: OpenPGP digital signature
