diff mbox

[PULL,08/24] iotests: Print full path of bad output if mismatch

Message ID 20170926142133.2498-9-kwolf@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kevin Wolf Sept. 26, 2017, 2:21 p.m. UTC 
From: Fam Zheng <famz@redhat.com>

So it is easier to copy paste the path.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake Sept. 26, 2017, 2:56 p.m. UTC | #1 
On 09/26/2017 09:21 AM, Kevin Wolf wrote:
> From: Fam Zheng <famz@redhat.com>
> 
> So it is easier to copy paste the path.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/check | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index d504b6e455..4583a0c269 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -353,7 +353,7 @@ do
>                  else
>                      echo " - output mismatch (see $seq.out.bad)"
>                      mv $tmp.out $seq.out.bad
> -                    $diff -w "$reference" $seq.out.bad
> +                    $diff -w "$reference" $(realpath $seq.out.bad)

This missed my review comments about being unsafe if $PWD contains spaces:
https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg04241.html
Kevin Wolf Sept. 26, 2017, 3:25 p.m. UTC | #2 
Am 26.09.2017 um 16:56 hat Eric Blake geschrieben:
> On 09/26/2017 09:21 AM, Kevin Wolf wrote:
> > From: Fam Zheng <famz@redhat.com>
> > 
> > So it is easier to copy paste the path.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > ---
> >  tests/qemu-iotests/check | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> > index d504b6e455..4583a0c269 100755
> > --- a/tests/qemu-iotests/check
> > +++ b/tests/qemu-iotests/check
> > @@ -353,7 +353,7 @@ do
> >                  else
> >                      echo " - output mismatch (see $seq.out.bad)"
> >                      mv $tmp.out $seq.out.bad
> > -                    $diff -w "$reference" $seq.out.bad
> > +                    $diff -w "$reference" $(realpath $seq.out.bad)
> 
> This missed my review comments about being unsafe if $PWD contains spaces:
> https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg04241.html

Sorry for missing this. Please send a follow-up patch to fix it.

Kevin
diff mbox

Patch

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index d504b6e455..4583a0c269 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -353,7 +353,7 @@  do
                 else
                     echo " - output mismatch (see $seq.out.bad)"
                     mv $tmp.out $seq.out.bad
-                    $diff -w "$reference" $seq.out.bad
+                    $diff -w "$reference" $(realpath $seq.out.bad)
                     err=true
                 fi
             fi