iotests: Fix duplicated diff output on failure
diff mbox series

Message ID 20190603134857.32359-1-kwolf@redhat.com
State New
Headers show
Series
  • iotests: Fix duplicated diff output on failure
Related show

Commit Message

Kevin Wolf June 3, 2019, 1:48 p.m. UTC
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(-)

Comments

Alex Bennée June 3, 2019, 2:24 p.m. UTC | #1
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

Patch
diff mbox series

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