[PATCH] xfstests 273: fix a typo

[PATCH] xfstests 273: fix a typo

[Wang Sheng-Hui]

Make the porter log cp failure into $seq.full by appending, not overwriting,
which can help debug.

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
---
  273 |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/273 b/273
index 67f3d6b..639e280 100755
--- a/273
+++ b/273
@@ -92,7 +92,7 @@ _porter()
  		exit
  	fi

-	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
+	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1
  	if [ $? -ne 0 ]
  	then
  		echo "_porter $_suffix not complete"
-- 
1.7.10.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[Dave Chinner]

On Wed, Feb 27, 2013 at 02:47:54PM +0800, Wang Sheng-Hui wrote:
> Make the porter log cp failure into $seq.full by appending, not overwriting,
> which can help debug.
> 
> Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>

Oops.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[David Sterba]

On Wed, Feb 27, 2013 at 02:47:54PM +0800, Wang Sheng-Hui wrote:
> Make the porter log cp failure into $seq.full by appending, not overwriting,
> which can help debug.
> 
> Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
> ---
>  273 |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/273 b/273
> index 67f3d6b..639e280 100755
> --- a/273
> +++ b/273
> @@ -92,7 +92,7 @@ _porter()
>  		exit
>  	fi
> 
> -	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
> +	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1

This gives me

273 154s ...    [20:05:00] [20:05:01] - output mismatch (see 273.out.bad)
    --- 273.out 2011-11-11 15:13:46.000000000 +0100
    +++ 273.out.bad     2013-03-06 20:05:01.000000000 +0100
    @@ -1,4 +1,4 @@
     QA output created by 273
    -------------------------------
    -start the workload
    -------------------------------
    +./273: line 95: syntax error near unexpected token `&'
    +./273: line 95: `  cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>>&1'
    +umount: /dev/sda9: not mounted
     ...
     (Run 'diff -u 273.out 273.out.bad' to see the entire diff)
---

The script calls /bin/bash, my version says
GNU bash, version 4.1.10(1)-release

david

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[Dave Chinner]

On Thu, Mar 07, 2013 at 12:22:22AM +0100, David Sterba wrote:
> On Wed, Feb 27, 2013 at 02:47:54PM +0800, Wang Sheng-Hui wrote:
> > Make the porter log cp failure into $seq.full by appending, not overwriting,
> > which can help debug.
> > 
> > Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
> > ---
> >  273 |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/273 b/273
> > index 67f3d6b..639e280 100755
> > --- a/273
> > +++ b/273
> > @@ -92,7 +92,7 @@ _porter()
> >  		exit
> >  	fi
> > 
> > -	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
> > +	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1
> 
> This gives me
> 
> 273 154s ...    [20:05:00] [20:05:01] - output mismatch (see 273.out.bad)
>     --- 273.out 2011-11-11 15:13:46.000000000 +0100
>     +++ 273.out.bad     2013-03-06 20:05:01.000000000 +0100
>     @@ -1,4 +1,4 @@
>      QA output created by 273
>     -------------------------------
>     -start the workload
>     -------------------------------
>     +./273: line 95: syntax error near unexpected token `&'
>     +./273: line 95: `  cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>>&1'
>     +umount: /dev/sda9: not mounted

that seems rather strange. The patch does this:

	....sub_$_suffix >>$seq.full 2>&1

and the error output you see is

	....sub_$_suffix >$seq.full 2>>&1

So it doesn't look lie you are running with the change that is
actually in the patch...
>      ...
>      (Run 'diff -u 273.out 273.out.bad' to see the entire diff)
> ---
> 
> The script calls /bin/bash, my version says
> GNU bash, version 4.1.10(1)-release

Wroks fine here, with:

GNU bash, version 4.2.37(1)-release

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[David Sterba]

On Thu, Mar 07, 2013 at 02:38:49PM +1100, Dave Chinner wrote:
> On Thu, Mar 07, 2013 at 12:22:22AM +0100, David Sterba wrote:
> > On Wed, Feb 27, 2013 at 02:47:54PM +0800, Wang Sheng-Hui wrote:
> > > -	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
> > > +	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1

This is quote from the mail, but the merged patch does something else.

> >     +./273: line 95: syntax error near unexpected token `&'
> >     +./273: line 95: `  cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>>&1'
> >     +umount: /dev/sda9: not mounted

> that seems rather strange. The patch does this:
> 
> 	....sub_$_suffix >>$seq.full 2>&1

http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git;a=commitdiff;h=0c5e67e46e476b70290033efc7feb784f7ecbab1;hp=08557e219c12e573be459407033495899f46967a

--- a/273
+++ b/273
@@ -92,7 +92,7 @@ _porter()
                exit
        fi
 
-       cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
+       cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>>&1
        if [ $? -ne 0 ]
        then
                echo "_porter $_suffix not complete"
---

> and the error output you see is
> 
> 	....sub_$_suffix >$seq.full 2>>&1
> 
> So it doesn't look lie you are running with the change that is
> actually in the patch...

There's a difference between the patch in mail and what has been merged, that
can happen, but I wonder why it works on your side.

Minimal reproducer that I used on machines with never bash:
---
touch origin
cp -r origin target >seq.full 2>>&1
---
bash --version: GNU bash, version 4.2.24(1)-release
and fails the same way.

> GNU bash, version 4.2.37(1)-release

I've checked bash sources (no git, just tar + context diff patches), there's no
apparent fix between 24-37 for that.

(Also tried to build a git tree, but filterdiff did not produce 1:1 unified
format of the separate patches and there are lots of conflicts).

If possible, I'd like avoid forcing a minimal version of bash, as the
enterprise distros do not always ship the latest ones, and this break the tests
unnecessarily.


david

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[David Sterba]

On Thu, Mar 07, 2013 at 12:06:01PM +0100, David Sterba wrote:
> (Also tried to build a git tree, but filterdiff did not produce 1:1 unified
> format of the separate patches and there are lots of conflicts).

I'm too git-centric and wanted to use 'git apply', but the 'patch'
utility is able to apply context diffs just fine, so now tested with
"GNU bash, version 4.2.42(2)-release"

$ bash-4.2/bash 273
273: line 4: syntax error near unexpected token `&'
273: line 4: `cp -r origin target >seq.full 2>>&1'

http://www.gnu.org/software/bash/manual/html_node/Redirections.html
does not list the syntactic construct as valid.


david

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests 273: fix a typo

[Dave Chinner]

On Thu, Mar 07, 2013 at 12:06:01PM +0100, David Sterba wrote:
> On Thu, Mar 07, 2013 at 02:38:49PM +1100, Dave Chinner wrote:
> > On Thu, Mar 07, 2013 at 12:22:22AM +0100, David Sterba wrote:
> > > On Wed, Feb 27, 2013 at 02:47:54PM +0800, Wang Sheng-Hui wrote:
> > > > -	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
> > > > +	cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1
> 
> This is quote from the mail, but the merged patch does something else.
> 
> > >     +./273: line 95: syntax error near unexpected token `&'
> > >     +./273: line 95: `  cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>>&1'
> > >     +umount: /dev/sda9: not mounted
> 
> > that seems rather strange. The patch does this:
> > 
> > 	....sub_$_suffix >>$seq.full 2>&1
> 
> http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git;a=commitdiff;h=0c5e67e46e476b70290033efc7feb784f7ecbab1;hp=08557e219c12e573be459407033495899f46967a

Oh....

> ---
> 
> > and the error output you see is
> > 
> > 	....sub_$_suffix >$seq.full 2>>&1
> > 
> > So it doesn't look lie you are running with the change that is
> > actually in the patch...
> 
> There's a difference between the patch in mail and what has been merged, that
> can happen, but I wonder why it works on your side.

.... because I haven't updated to the latest xfstests master branch
yet - I'm running with the patch from the list applied. I didn't
realise you were running from the main repo, and that the commit was
busted...

Cheers,

Dave.

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs