iotests: Fix duplicated diff output on failure

[Qemu-devel] [PATCH] iotests: Fix duplicated diff output on failure

Kevin Wolf posted 1 patch 4 years, 10 months ago

Download mbox

Test s390x passed

Test checkpatch passed

Test asan passed

Test docker-mingw@fedora passed

Test docker-clang@ubuntu passed

Test FreeBSD passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190603134857.32359-1-kwolf@redhat.com

Maintainers: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>

tests/qemu-iotests/check | 1 -
1 file changed, 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] iotests: Fix duplicated diff output on failure

Posted by Kevin Wolf 4 years, 10 months ago

Commit 70ff5b07 wanted to move the diff between actual and reference
output to the end after printing the test result line. It really only
copied it, though, so the diff is now displayed twice. Remove the old
one.

Fixes: 70ff5b07fcdd378180ad2d5cc0b0d5e67e7ef325
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/check | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 95162c6cf9..44ebf24080 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -876,7 +876,6 @@ do
                     fi
                 else
                     mv $tmp.out $seq.out.bad
-                    $diff -w "$reference" "$PWD"/$seq.out.bad
                     status="fail"
                     results="output mismatch (see $seq.out.bad)"
                     printdiff=true
-- 
2.20.1

Re: [Qemu-devel] [PATCH] iotests: Fix duplicated diff output on failure

Posted by Alex Bennée 4 years, 10 months ago

Kevin Wolf <kwolf@redhat.com> writes:

> Commit 70ff5b07 wanted to move the diff between actual and reference
> output to the end after printing the test result line. It really only
> copied it, though, so the diff is now displayed twice. Remove the old
> one.
>
> Fixes: 70ff5b07fcdd378180ad2d5cc0b0d5e67e7ef325
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Queued to testing/next, thanks.

> ---
>  tests/qemu-iotests/check | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index 95162c6cf9..44ebf24080 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -876,7 +876,6 @@ do
>                      fi
>                  else
>                      mv $tmp.out $seq.out.bad
> -                    $diff -w "$reference" "$PWD"/$seq.out.bad
>                      status="fail"
>                      results="output mismatch (see $seq.out.bad)"
>                      printdiff=true


--
Alex Bennée