[PATCH 1/3] xfstests: remove comments about creator in new

[PATCH 1/3] xfstests: remove comments about creator in new

[Eryu Guan]

We have removed creator/owner info from each test case, remove the
'creator' comment in template too.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 new | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/new b/new
index 2bc1e8f..f712892 100755
--- a/new
+++ b/new
@@ -104,7 +104,7 @@ cat <<End-of-File >$id
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #-----------------------------------------------------------------------
 #
-# creator
+
 seq=\`basename \$0\`
 seqres=\$RESULT_DIR/\$seq
 echo "QA output created by \$seq"
-- 
1.8.1.4

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

[PATCH 2/3] xfstests: replace $seq.full with $seqres.full in ext4/305 and generic/308

[Eryu Guan]

We use $seqres.full to record verbose output now, replace $seq.full with
$seqres.full in ext4/305 and generic/308.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/ext4/305    | 6 +++---
 tests/generic/308 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ext4/305 b/tests/ext4/305
index bf9d9cd..eee461a 100644
--- a/tests/ext4/305
+++ b/tests/ext4/305
@@ -46,12 +46,12 @@ _supported_os Linux
 
 _require_scratch
 
-rm -f $seq.full
+rm -f $seqres.full
 echo "Silence is golden"
 
 DEV_BASENAME=$(basename $(readlink -f $SCRATCH_DEV))
-echo "Start test on device $SCRATCH_DEV, basename $DEV_BASENAME" >$seq.full
-_scratch_mkfs >>$seq.full 2>&1
+echo "Start test on device $SCRATCH_DEV, basename $DEV_BASENAME" >$seqres.full
+_scratch_mkfs >>$seqres.full 2>&1
 
 while true;do
 	mount $SCRATCH_DEV $SCRATCH_MNT
diff --git a/tests/generic/308 b/tests/generic/308
index 0db093a..8037c08 100644
--- a/tests/generic/308
+++ b/tests/generic/308
@@ -45,7 +45,7 @@ testfile=$TEST_DIR/testfile.$seq
 _supported_fs generic
 _supported_os Linux
 
-rm -f $seq.full
+rm -f $seqres.full
 echo "Silence is golden"
 
 block_size=`stat -f -c %s $TEST_DIR`
@@ -58,11 +58,11 @@ block_size=`stat -f -c %s $TEST_DIR`
 
 # Create a sparse file with an extent lays at one block before old s_maxbytes
 offset=$(((2**32 - 2) * $block_size))
-$XFS_IO_PROG -f -c "pwrite $offset $block_size" -c fsync $testfile >$seq.full 2>&1
+$XFS_IO_PROG -f -c "pwrite $offset $block_size" -c fsync $testfile >$seqres.full 2>&1
 
 # Write to the block after the extent just created
 offset=$(((2**32 - 1) * $block_size))
-$XFS_IO_PROG -f -c "pwrite $offset $block_size" -c fsync $testfile >>$seq.full 2>&1
+$XFS_IO_PROG -f -c "pwrite $offset $block_size" -c fsync $testfile >>$seqres.full 2>&1
 
 # Got here without hitting BUG_ON(), test passed
 status=0
-- 
1.8.1.4

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

[PATCH 3/3] xfstests generic 310: fix common file path and other cleanups

[Eryu Guan]

1. add one space between # and test description
2. remove creator/owner info
3. fix common/rc and common/filter path so they can be sourced correctly
4. no need to remove $seq.full cause it's not used(or if verbose output
   is needed, $seqres.full should be used)

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/generic/310 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/generic/310 b/tests/generic/310
index ef51422..35baa23 100644
--- a/tests/generic/310
+++ b/tests/generic/310
@@ -1,8 +1,8 @@
 #! /bin/bash
 # FS QA Test No. 310
 #
-#Check if there are two threads,one keeps calling read() or lseek(), and
-#the other calling readdir(), both on the same directory fd.
+# Check if there are two threads,one keeps calling read() or lseek(), and
+# the other calling readdir(), both on the same directory fd.
 #
 # Based on a testcase from Li Zefan <lizefan@huawei.com>.
 #
@@ -25,10 +25,9 @@
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #-----------------------------------------------------------------------
 #
-# creator
-owner=zhaohongjiang@huawei.com
 
 seq=`basename $0`
+seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 status=1	# failure is the default!
@@ -40,8 +39,8 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
@@ -71,6 +70,5 @@ _test_lseek
 
 # success, all done
 echo "*** done"
-rm -f $seq.full
 status=0
 exit
-- 
1.8.1.4

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

Re: [PATCH 1/3] xfstests: remove comments about creator in new

[Rich Johnston]

Looks good.

Reviewed-by: Rich Johnston <rjohnston@sgi.com>


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

Re: [PATCH 2/3] xfstests: replace $seq.full with $seqres.full in ext4/305 and generic/308

[Rich Johnston]

Hey Eryu,

Where is the patch [0/3] ;)
Also patches should be submitted as inline attachments.

Thanks for the cleanup patch.
Looks good.

Reviewed-by: Rich Johnston <rjohnston@sgi.com>

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

Re: [PATCH 3/3] xfstests generic 310: fix common file path and other cleanups

[Rich Johnston]

Hi Eryu,

Thanks for this cleanup patch. I was going to revert patch "bbaf78c0" 
which introduced test generic/310 but will wait and see if Zhao will 
provide more information which could be added to this patch.


On 04/07/2013 05:39 AM, Eryu Guan wrote:
> 1. add one space between # and test description

The rest of the changes look good, sorry I missed them when I reviewed ;).

> 2. remove creator/owner info
> 3. fix common/rc and common/filter path so they can be sourced correctly
> 4. no need to remove $seq.full cause it's not used(or if verbose output
>     is needed, $seqres.full should be used)
>
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---
>   tests/generic/310 | 12 +++++-------
>   1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/tests/generic/310 b/tests/generic/310
> index ef51422..35baa23 100644
> --- a/tests/generic/310
> +++ b/tests/generic/310
> @@ -1,8 +1,8 @@
>   #! /bin/bash
>   # FS QA Test No. 310
>   #
> -#Check if there are two threads,one keeps calling read() or lseek(), and
> -#the other calling readdir(), both on the same directory fd.
> +# Check if there are two threads,one keeps calling read() or lseek(), and
> +# the other calling readdir(), both on the same directory fd.
>   #

Hi Zhao,

I did see both threads running at the same time, but the more I look at 
this, the more I am a loss as to what this test is doing.

Will you expand this a little please.  I should have asked for more 
justification the first time I reviewed this. Please provide what bug
this is testing or what failure/weakness this test exposes.  If there is 
a commit this is related to, please reference it.

Thanks
--Rich

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

Re: [PATCH 3/3] xfstests generic 310: fix common file path and other cleanups

[Eryu Guan]

On Mon, Apr 08, 2013 at 09:05:07AM -0500, Rich Johnston wrote:
> Hi Eryu,
> 
> Thanks for this cleanup patch. I was going to revert patch
> "bbaf78c0" which introduced test generic/310 but will wait and see
> if Zhao will provide more information which could be added to this
> patch.

Make sense, thanks for the review.
> 
> 
> On 04/07/2013 05:39 AM, Eryu Guan wrote:
> >1. add one space between # and test description
> 
> The rest of the changes look good, sorry I missed them when I reviewed ;).
> 
> >2. remove creator/owner info
> >3. fix common/rc and common/filter path so they can be sourced correctly
> >4. no need to remove $seq.full cause it's not used(or if verbose output
> >    is needed, $seqres.full should be used)
> >
> >Signed-off-by: Eryu Guan <eguan@redhat.com>
> >---
> >  tests/generic/310 | 12 +++++-------
> >  1 file changed, 5 insertions(+), 7 deletions(-)
> >
> >diff --git a/tests/generic/310 b/tests/generic/310
> >index ef51422..35baa23 100644
> >--- a/tests/generic/310
> >+++ b/tests/generic/310
> >@@ -1,8 +1,8 @@
> >  #! /bin/bash
> >  # FS QA Test No. 310
> >  #
> >-#Check if there are two threads,one keeps calling read() or lseek(), and
> >-#the other calling readdir(), both on the same directory fd.
> >+# Check if there are two threads,one keeps calling read() or lseek(), and
> >+# the other calling readdir(), both on the same directory fd.
> >  #
> 
> Hi Zhao,
> 
> I did see both threads running at the same time, but the more I look
> at this, the more I am a loss as to what this test is doing.
> 
> Will you expand this a little please.  I should have asked for more
> justification the first time I reviewed this. Please provide what
> bug
> this is testing or what failure/weakness this test exposes.  If
> there is a commit this is related to, please reference it.

I didn't look into the test deeply but I found the test seems to run for
hours on my 3.9-rc4 test box, not sure what goes wrong here.

Thanks,
Eryu
> 
> Thanks
> --Rich

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

Re: [PATCH 1/3] xfstests: remove comments about creator in new

[Rich Johnston]

Eryu,

Thanks for the patch, it has been committed.

--Rich

commit 17ecca6b12c066735ce344417adb5824310fc67a
Author: Eryu Guan <eguan@redhat.com>
Date:   Sun Apr 7 10:39:05 2013 +0000

     xfstests: remove comments about creator in new

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

Re: [PATCH 2/3] xfstests: replace $seq.full with $seqres.full in ext4/305 and generic/308

[Rich Johnston]

Eryu,

Thanks for the patch, it has been committed.

--Rich

commit 2bfce6d36f9fb1cba6a0c677a82c08a6f305db62
Author: Eryu Guan <eguan@redhat.com>
Date:   Sun Apr 7 10:39:06 2013 +0000

     xfstests: replace $seq.full with $seqres.full in ext4/305 and 
generic/308


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