On 2017-07-25 10:59, Kevin Wolf wrote:
> Commits 70f17a1 ('error: Revert unwanted change of warning messages')
> and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge
> conflict, which results in failure for qemu-iotests case 186. Fix the
> reference output to consider the changes of 70f17a1.
>
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> ---
> tests/qemu-iotests/186.out | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)I've noticed that test 186 fails when not using qemu-system-x86_64, though (just build with --target-list=i386-softmmu, for example). But this patch doesn't make it worse, so I'll keep it. Max
signature.asc
Description: OpenPGP digital signature
