[PATCH 0/4] fstests: some random cleanups

[PATCH 0/4] fstests: some random cleanups

[Eryu Guan]

Some random and simple cleanups.

Eryu Guan (4):
  xfs/071: remove xfs/071.out from git
  fstests: change mode of test files to 0755
  btrfs/017: remove duplicate test
  common: fix comment about _require_test

 common/rc           |   2 +-
 tests/btrfs/010     |   0
 tests/btrfs/013     |   0
 tests/btrfs/015     |   0
 tests/btrfs/017     |  61 ------------------------------
 tests/btrfs/017.out |   2 -
 tests/btrfs/018     |   0
 tests/btrfs/026     |   0
 tests/btrfs/027     |   0
 tests/btrfs/028     |   0
 tests/btrfs/029     |   0
 tests/btrfs/031     |   0
 tests/btrfs/043     |   0
 tests/btrfs/044     |   0
 tests/btrfs/046     |   0
 tests/btrfs/049     |   0
 tests/btrfs/057     |   0
 tests/btrfs/058     |   0
 tests/btrfs/076     |   0
 tests/btrfs/077     |   0
 tests/btrfs/group   |   1 -
 tests/generic/029   |   0
 tests/generic/030   |   0
 tests/generic/031   |   0
 tests/generic/032   |   0
 tests/generic/033   |   0
 tests/generic/323   |   0
 tests/generic/324   |   0
 tests/xfs/071.out   | 107 ----------------------------------------------------
 tests/xfs/298       |   0
 tests/xfs/306       |   0
 31 files changed, 1 insertion(+), 172 deletions(-)
 mode change 100644 => 100755 tests/btrfs/010
 mode change 100644 => 100755 tests/btrfs/013
 mode change 100644 => 100755 tests/btrfs/015
 delete mode 100644 tests/btrfs/017
 delete mode 100644 tests/btrfs/017.out
 mode change 100644 => 100755 tests/btrfs/018
 mode change 100644 => 100755 tests/btrfs/026
 mode change 100644 => 100755 tests/btrfs/027
 mode change 100644 => 100755 tests/btrfs/028
 mode change 100644 => 100755 tests/btrfs/029
 mode change 100644 => 100755 tests/btrfs/031
 mode change 100644 => 100755 tests/btrfs/043
 mode change 100644 => 100755 tests/btrfs/044
 mode change 100644 => 100755 tests/btrfs/046
 mode change 100644 => 100755 tests/btrfs/049
 mode change 100644 => 100755 tests/btrfs/057
 mode change 100644 => 100755 tests/btrfs/058
 mode change 100644 => 100755 tests/btrfs/076
 mode change 100644 => 100755 tests/btrfs/077
 mode change 100644 => 100755 tests/generic/029
 mode change 100644 => 100755 tests/generic/030
 mode change 100644 => 100755 tests/generic/031
 mode change 100644 => 100755 tests/generic/032
 mode change 100644 => 100755 tests/generic/033
 mode change 100644 => 100755 tests/generic/323
 mode change 100644 => 100755 tests/generic/324
 delete mode 100644 tests/xfs/071.out
 mode change 100644 => 100755 tests/xfs/298
 mode change 100644 => 100755 tests/xfs/306

-- 
1.8.3.1

[PATCH 1/4] xfs/071: remove xfs/071.out from git

[Eryu Guan]

xfs/071.out is supposed to linked to the right out file at run time.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/xfs/071.out | 107 ------------------------------------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 tests/xfs/071.out

diff --git a/tests/xfs/071.out b/tests/xfs/071.out
deleted file mode 100644
index 2ea0ef0..0000000
--- a/tests/xfs/071.out
+++ /dev/null
@@ -1,107 +0,0 @@
-QA output created by 071
-meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
-data     = bsize=XXX blocks=XXX, imaxpct=PCT
-         = sunit=XXX swidth=XXX, unwritten=X
-naming   =VERN bsize=XXX
-log      =LDEV bsize=XXX blocks=XXX
-realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
-
-Writing 512 bytes, offset is +0 (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 512 bytes (direct=false)
-read 512/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1 byte (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 512 bytes (direct=false)
-read 512/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1FSB (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 512 bytes (direct=false)
-read 512/512 bytes at offset <OFFSET>
-
-Writing 1 bytes, offset is minus 1FSB (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 1 bytes (direct=false)
-read 1/1 bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is +0 (direct=true)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 1FSB bytes (direct=true)
-read 512/1FSB bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is minus 1FSB (direct=true)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 1FSB bytes (direct=true)
-read 513/1FSB bytes at offset <OFFSET>
-
-=== Iterating, 2 remains
-
-
-Writing 512 bytes, offset is +0 (direct=false)
-pwrite64: File too large
-Reading 512 bytes (direct=false)
-read 0/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1 byte (direct=false)
-pwrite64: File too large
-Reading 512 bytes (direct=false)
-read 0/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1FSB (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 512 bytes (direct=false)
-read 512/512 bytes at offset <OFFSET>
-
-Writing 1 bytes, offset is minus 1FSB (direct=false)
-wrote 512/512 bytes at offset <OFFSET>
-Reading 1 bytes (direct=false)
-read 1/1 bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is +0 (direct=true)
-pwrite64: File too large
-Reading 1FSB bytes (direct=true)
-read 0/1FSB bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is minus 1FSB (direct=true)
-pwrite64: File too large
-Reading 1FSB bytes (direct=true)
-read 0/1FSB bytes at offset <OFFSET>
-
-=== Iterating, 1 remains
-
-
-Writing 512 bytes, offset is +0 (direct=false)
-pwrite64: File too large
-Reading 512 bytes (direct=false)
-read 0/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1 byte (direct=false)
-pwrite64: File too large
-Reading 512 bytes (direct=false)
-read 0/512 bytes at offset <OFFSET>
-
-Writing 512 bytes, offset is minus 1FSB (direct=false)
-pwrite64: File too large
-Reading 512 bytes (direct=false)
-read 0/512 bytes at offset <OFFSET>
-
-Writing 1 bytes, offset is minus 1FSB (direct=false)
-pwrite64: File too large
-Reading 1 bytes (direct=false)
-read 0/1 bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is +0 (direct=true)
-pwrite64: File too large
-Reading 1FSB bytes (direct=true)
-read 0/1FSB bytes at offset <OFFSET>
-
-Writing 1FSB bytes, offset is minus 1FSB (direct=true)
-pwrite64: File too large
-Reading 1FSB bytes (direct=true)
-read 0/1FSB bytes at offset <OFFSET>
-
-=== Iterating, 0 remains
-
-
-- 
1.8.3.1

[PATCH 2/4] fstests: change mode of test files to 0755

[Eryu Guan]

Performed by

find tests -perm 644 -name [0-9][0-9][0-9] -exec chmod 755 {} \;

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/btrfs/010   | 0
 tests/btrfs/013   | 0
 tests/btrfs/015   | 0
 tests/btrfs/017   | 0
 tests/btrfs/018   | 0
 tests/btrfs/026   | 0
 tests/btrfs/027   | 0
 tests/btrfs/028   | 0
 tests/btrfs/029   | 0
 tests/btrfs/031   | 0
 tests/btrfs/043   | 0
 tests/btrfs/044   | 0
 tests/btrfs/046   | 0
 tests/btrfs/049   | 0
 tests/btrfs/057   | 0
 tests/btrfs/058   | 0
 tests/btrfs/076   | 0
 tests/btrfs/077   | 0
 tests/generic/029 | 0
 tests/generic/030 | 0
 tests/generic/031 | 0
 tests/generic/032 | 0
 tests/generic/033 | 0
 tests/generic/323 | 0
 tests/generic/324 | 0
 tests/xfs/298     | 0
 tests/xfs/306     | 0
 27 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tests/btrfs/010
 mode change 100644 => 100755 tests/btrfs/013
 mode change 100644 => 100755 tests/btrfs/015
 mode change 100644 => 100755 tests/btrfs/017
 mode change 100644 => 100755 tests/btrfs/018
 mode change 100644 => 100755 tests/btrfs/026
 mode change 100644 => 100755 tests/btrfs/027
 mode change 100644 => 100755 tests/btrfs/028
 mode change 100644 => 100755 tests/btrfs/029
 mode change 100644 => 100755 tests/btrfs/031
 mode change 100644 => 100755 tests/btrfs/043
 mode change 100644 => 100755 tests/btrfs/044
 mode change 100644 => 100755 tests/btrfs/046
 mode change 100644 => 100755 tests/btrfs/049
 mode change 100644 => 100755 tests/btrfs/057
 mode change 100644 => 100755 tests/btrfs/058
 mode change 100644 => 100755 tests/btrfs/076
 mode change 100644 => 100755 tests/btrfs/077
 mode change 100644 => 100755 tests/generic/029
 mode change 100644 => 100755 tests/generic/030
 mode change 100644 => 100755 tests/generic/031
 mode change 100644 => 100755 tests/generic/032
 mode change 100644 => 100755 tests/generic/033
 mode change 100644 => 100755 tests/generic/323
 mode change 100644 => 100755 tests/generic/324
 mode change 100644 => 100755 tests/xfs/298
 mode change 100644 => 100755 tests/xfs/306

diff --git a/tests/btrfs/010 b/tests/btrfs/010
old mode 100644
new mode 100755
diff --git a/tests/btrfs/013 b/tests/btrfs/013
old mode 100644
new mode 100755
diff --git a/tests/btrfs/015 b/tests/btrfs/015
old mode 100644
new mode 100755
diff --git a/tests/btrfs/017 b/tests/btrfs/017
old mode 100644
new mode 100755
diff --git a/tests/btrfs/018 b/tests/btrfs/018
old mode 100644
new mode 100755
diff --git a/tests/btrfs/026 b/tests/btrfs/026
old mode 100644
new mode 100755
diff --git a/tests/btrfs/027 b/tests/btrfs/027
old mode 100644
new mode 100755
diff --git a/tests/btrfs/028 b/tests/btrfs/028
old mode 100644
new mode 100755
diff --git a/tests/btrfs/029 b/tests/btrfs/029
old mode 100644
new mode 100755
diff --git a/tests/btrfs/031 b/tests/btrfs/031
old mode 100644
new mode 100755
diff --git a/tests/btrfs/043 b/tests/btrfs/043
old mode 100644
new mode 100755
diff --git a/tests/btrfs/044 b/tests/btrfs/044
old mode 100644
new mode 100755
diff --git a/tests/btrfs/046 b/tests/btrfs/046
old mode 100644
new mode 100755
diff --git a/tests/btrfs/049 b/tests/btrfs/049
old mode 100644
new mode 100755
diff --git a/tests/btrfs/057 b/tests/btrfs/057
old mode 100644
new mode 100755
diff --git a/tests/btrfs/058 b/tests/btrfs/058
old mode 100644
new mode 100755
diff --git a/tests/btrfs/076 b/tests/btrfs/076
old mode 100644
new mode 100755
diff --git a/tests/btrfs/077 b/tests/btrfs/077
old mode 100644
new mode 100755
diff --git a/tests/generic/029 b/tests/generic/029
old mode 100644
new mode 100755
diff --git a/tests/generic/030 b/tests/generic/030
old mode 100644
new mode 100755
diff --git a/tests/generic/031 b/tests/generic/031
old mode 100644
new mode 100755
diff --git a/tests/generic/032 b/tests/generic/032
old mode 100644
new mode 100755
diff --git a/tests/generic/033 b/tests/generic/033
old mode 100644
new mode 100755
diff --git a/tests/generic/323 b/tests/generic/323
old mode 100644
new mode 100755
diff --git a/tests/generic/324 b/tests/generic/324
old mode 100644
new mode 100755
diff --git a/tests/xfs/298 b/tests/xfs/298
old mode 100644
new mode 100755
diff --git a/tests/xfs/306 b/tests/xfs/306
old mode 100644
new mode 100755
-- 
1.8.3.1

[PATCH 3/4] btrfs/017: remove duplicate test

[Eryu Guan]

btrfs/017 is same as btrfs/015, remove it.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/btrfs/017     | 61 -----------------------------------------------------
 tests/btrfs/017.out |  2 --
 tests/btrfs/group   |  1 -
 3 files changed, 64 deletions(-)
 delete mode 100755 tests/btrfs/017
 delete mode 100644 tests/btrfs/017.out

diff --git a/tests/btrfs/017 b/tests/btrfs/017
deleted file mode 100755
index 1f31e8a..0000000
--- a/tests/btrfs/017
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/bash
-# FS QA Test No. btrfs/017
-#
-# Regression test to make sure we can create a snapshot after mounting with
-# readonly and remounting rw.
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2013 Fusion IO.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#-----------------------------------------------------------------------
-#
-
-seq=`basename $0`
-seqres=$RESULT_DIR/$seq
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-
-status=1	# failure is the default!
-
-_cleanup()
-{
-	rm -f $tmp.*
-}
-
-trap "_cleanup ; exit \$status" 0 1 2 3 15
-
-# get standard environment, filters and checks
-. ./common/rc
-. ./common/filter
-
-# real QA test starts here
-_supported_fs btrfs
-_supported_os Linux
-_require_scratch
-
-rm -f $seqres.full
-
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount -o ro
-_scratch_mount -o rw,remount
-
-$BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap >> $seqres.full 2>&1 \
-	|| _fail "couldn't create snapshot"
-
-echo "Silence is golden"
-status=0 ; exit
diff --git a/tests/btrfs/017.out b/tests/btrfs/017.out
deleted file mode 100644
index 8222844..0000000
--- a/tests/btrfs/017.out
+++ /dev/null
@@ -1,2 +0,0 @@
-QA output created by 017
-Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index b63f174..8db4618 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -19,7 +19,6 @@
 014 auto
 015 auto quick
 016 auto quick
-017 auto quick
 018 auto quick
 019 auto quick
 020 auto quick
-- 
1.8.3.1

[PATCH 4/4] common: fix comment about _require_test

[Eryu Guan]

_require_test will mount test dev if not mounted, fix the comment to
reflect that.

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

diff --git a/common/rc b/common/rc
index d5e3aff..9a4da56 100644
--- a/common/rc
+++ b/common/rc
@@ -1104,7 +1104,7 @@ _require_scratch()
 }
 
 
-# this test needs a test partition - check we're ok & unmount it
+# this test needs a test partition - check we're ok & mount it
 #
 _require_test()
 {
-- 
1.8.3.1

Re: [PATCH 3/4] btrfs/017: remove duplicate test

[Josef Bacik]

On 12/11/2014 12:16 PM, Eryu Guan wrote:
> btrfs/017 is same as btrfs/015, remove it.
>
> Signed-off-by: Eryu Guan <eguan@redhat.com>

Reviewed-by: Josef Bacik <jbacik@fb.com>

Thanks,

Josef

Re: [PATCH 2/4] fstests: change mode of test files to 0755

[Josef Bacik]

On 12/11/2014 12:16 PM, Eryu Guan wrote:
> Performed by
>
> find tests -perm 644 -name [0-9][0-9][0-9] -exec chmod 755 {} \;
>

Reviewed-by: Josef Bacik <jbacik@fb.com>

Thanks,

Josef

Re: [PATCH 4/4] common: fix comment about _require_test

[Josef Bacik]

On 12/11/2014 12:16 PM, Eryu Guan wrote:
> _require_test will mount test dev if not mounted, fix the comment to
> reflect that.
>
> Signed-off-by: Eryu Guan <eguan@redhat.com>

Reviewed-by: Josef Bacik <jbacik@fb.com>

Thanks,

Josef