Skip to contentSkip to conversation

iotests: Fix duplicated diff output on failure

PATCH In review Kevin Wolf 2 participants 2 messages Jun 3, 2019

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 iotests: Fix duplicated diff output on failure

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
---
 tests/qemu-iotests/check | 1 -
 1 file changed, 1 deletion(-)
tests/qemu-iotests/check +0 -1
index 95162c6cf9..44ebf24080 100755
@@ -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
Signature · 1 line
2.20.1
#1 lore raw
Quoted 7 lines · Kevin Wolf

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

Queued to testing/next, thanks.

Quoted 9 lines
---
 tests/qemu-iotests/check | 1 -
 1 file changed, 1 deletion(-)
tests/qemu-iotests/check +0 -0
index 95162c6cf9..44ebf24080 100755

tests/qemu-iotests/check do · line 881

Quoted 7 lines
tests/qemu-iotests/check +0 -1
@@ -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