Skip to contentSkip to conversation

xfstests: xfstests: move tests out of top level

PATCH In review Dave Chinner 4 participants 59 messages Mar 15, 2013 – Mar 27, 2013 Arm/actions semi architecture Page 4 of 4

lore
Share & tools
lore
Reviewed-by on v1 20/25
#46 lore raw

Re: [PATCH 20/25] xfstests: introduce a common directory

In reply to Dave Chinner

Looks OK.

Quoted 5,282 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Introduce a top level common directory and move all the common.* files into it. Because there is now a directory named common, the prefix can be dropped from all the files. Convert all the tests to use this new directory for including common files.

for f in common.*; do \
	git mv `echo -n "$f " ; echo $f | sed -e 's;n\.;n/;'` \

done

---
 check                                    |   10 +++++-----
 common.attr => common/attr               |    0
 common.config => common/config           |    0
 common.defrag => common/defrag           |    0
 common.dmapi => common/dmapi             |    0
 common.dump => common/dump               |    0
 common.filestreams => common/filestreams |    0
 common.filter => common/filter           |    0
 btrfs.filter => common/filter.btrfs      |    0
 common.log => common/log                 |    0
 common.punch => common/punch             |    2 +-
 common.quota => common/quota             |    0
 common.rc => common/rc                   |    2 +-
 common.repair => common/repair           |    0
 common.scsi_debug => common/scsi_debug   |    0
 tests/btrfs/254                          |    4 ++--
 tests/btrfs/264                          |    4 ++--
 tests/btrfs/265                          |    4 ++--
 tests/btrfs/276                          |    4 ++--
 tests/btrfs/284                          |    6 +++---
 tests/btrfs/313                          |    4 ++--
 tests/ext4/271                           |    4 ++--
 tests/ext4/301                           |    6 +++---
 tests/ext4/302                           |    6 +++---
 tests/ext4/303                           |    6 +++---
 tests/ext4/304                           |    6 +++---
 tests/generic/001                        |    4 ++--
 tests/generic/002                        |    4 ++--
 tests/generic/005                        |    4 ++--
 tests/generic/006                        |    4 ++--
 tests/generic/007                        |    4 ++--
 tests/generic/010                        |    4 ++--
 tests/generic/011                        |    4 ++--
 tests/generic/013                        |    4 ++--
 tests/generic/014                        |    4 ++--
 tests/generic/015                        |    4 ++--
 tests/generic/020                        |    6 +++---
 tests/generic/053                        |    6 +++---
 tests/generic/062                        |    6 +++---
 tests/generic/068                        |    4 ++--
 tests/generic/069                        |    4 ++--
 tests/generic/070                        |    6 +++---
 tests/generic/074                        |    4 ++--
 tests/generic/075                        |    4 ++--
 tests/generic/076                        |    4 ++--
 tests/generic/077                        |    6 +++---
 tests/generic/079                        |    6 +++---
 tests/generic/083                        |    4 ++--
 tests/generic/088                        |    4 ++--
 tests/generic/089                        |    4 ++--
 tests/generic/091                        |    4 ++--
 tests/generic/093                        |    6 +++---
 tests/generic/097                        |    4 ++--
 tests/generic/099                        |    6 +++---
 tests/generic/100                        |    6 +++---
 tests/generic/105                        |    6 +++---
 tests/generic/112                        |    4 ++--
 tests/generic/113                        |    4 ++--
 tests/generic/117                        |    6 +++---
 tests/generic/120                        |    4 ++--
 tests/generic/123                        |    4 ++--
 tests/generic/124                        |    4 ++--
 tests/generic/125                        |    4 ++--
 tests/generic/126                        |    4 ++--
 tests/generic/127                        |    4 ++--
 tests/generic/128                        |    4 ++--
 tests/generic/129                        |    4 ++--
 tests/generic/130                        |    4 ++--
 tests/generic/131                        |    4 ++--
 tests/generic/132                        |    4 ++--
 tests/generic/133                        |    4 ++--
 tests/generic/135                        |    4 ++--
 tests/generic/141                        |    4 ++--
 tests/generic/169                        |    4 ++--
 tests/generic/184                        |    4 ++--
 tests/generic/192                        |    4 ++--
 tests/generic/193                        |    4 ++--
 tests/generic/198                        |    4 ++--
 tests/generic/204                        |    4 ++--
 tests/generic/207                        |    4 ++--
 tests/generic/208                        |    4 ++--
 tests/generic/209                        |    4 ++--
 tests/generic/210                        |    4 ++--
 tests/generic/211                        |    4 ++--
 tests/generic/212                        |    4 ++--
 tests/generic/213                        |    4 ++--
 tests/generic/214                        |    4 ++--
 tests/generic/215                        |    4 ++--
 tests/generic/219                        |    6 +++---
 tests/generic/221                        |    2 +-
 tests/generic/223                        |    4 ++--
 tests/generic/224                        |    4 ++--
 tests/generic/225                        |    4 ++--
 tests/generic/226                        |    2 +-
 tests/generic/228                        |    2 +-
 tests/generic/230                        |    6 +++---
 tests/generic/231                        |    6 +++---
 tests/generic/232                        |    6 +++---
 tests/generic/233                        |    6 +++---
 tests/generic/234                        |    6 +++---
 tests/generic/235                        |    6 +++---
 tests/generic/236                        |    2 +-
 tests/generic/237                        |    6 +++---
 tests/generic/239                        |    4 ++--
 tests/generic/240                        |    4 ++--
 tests/generic/241                        |    4 ++--
 tests/generic/245                        |    4 ++--
 tests/generic/246                        |    4 ++--
 tests/generic/247                        |    4 ++--
 tests/generic/248                        |    4 ++--
 tests/generic/249                        |    4 ++--
 tests/generic/251                        |    4 ++--
 tests/generic/255                        |    6 +++---
 tests/generic/256                        |    6 +++---
 tests/generic/257                        |    4 ++--
 tests/generic/258                        |    2 +-
 tests/generic/260                        |    4 ++--
 tests/generic/263                        |    4 ++--
 tests/generic/269                        |    4 ++--
 tests/generic/270                        |    6 +++---
 tests/generic/273                        |    4 ++--
 tests/generic/274                        |    4 ++--
 tests/generic/275                        |    4 ++--
 tests/generic/277                        |    4 ++--
 tests/generic/280                        |    6 +++---
 tests/generic/285                        |    4 ++--
 tests/generic/286                        |    4 ++--
 tests/generic/288                        |    4 ++--
 tests/generic/294                        |    4 ++--
 tests/generic/299                        |    4 ++--
 tests/generic/300                        |    4 ++--
 tests/shared/051                         |    6 +++---
 tests/shared/218                         |    6 +++---
 tests/shared/243                         |    4 ++--
 tests/shared/272                         |    4 ++--
 tests/shared/289                         |    4 ++--
 tests/shared/298                         |    4 ++--
 tests/shared/305                         |    6 +++---
 tests/udf/098                            |    4 ++--
 tests/udf/101                            |    4 ++--
 tests/udf/102                            |    4 ++--
 tests/xfs/003                            |    4 ++--
 tests/xfs/004                            |    4 ++--
 tests/xfs/008                            |    4 ++--
 tests/xfs/009                            |    4 ++--
 tests/xfs/012                            |    4 ++--
 tests/xfs/016                            |    4 ++--
 tests/xfs/017                            |    4 ++--
 tests/xfs/018                            |    6 +++---
 tests/xfs/019                            |    4 ++--
 tests/xfs/021                            |    6 +++---
 tests/xfs/022                            |    4 ++--
 tests/xfs/023                            |    4 ++--
 tests/xfs/024                            |    4 ++--
 tests/xfs/025                            |    4 ++--
 tests/xfs/026                            |    4 ++--
 tests/xfs/027                            |    4 ++--
 tests/xfs/028                            |    4 ++--
 tests/xfs/029                            |    4 ++--
 tests/xfs/030                            |    6 +++---
 tests/xfs/031                            |    6 +++---
 tests/xfs/032                            |    4 ++--
 tests/xfs/033                            |    6 +++---
 tests/xfs/034                            |    4 ++--
 tests/xfs/035                            |    4 ++--
 tests/xfs/036                            |    4 ++--
 tests/xfs/037                            |    4 ++--
 tests/xfs/038                            |    4 ++--
 tests/xfs/039                            |    4 ++--
 tests/xfs/040                            |    4 ++--
 tests/xfs/041                            |    4 ++--
 tests/xfs/042                            |    4 ++--
 tests/xfs/043                            |    4 ++--
 tests/xfs/044                            |    4 ++--
 tests/xfs/045                            |    4 ++--
 tests/xfs/046                            |    4 ++--
 tests/xfs/047                            |    4 ++--
 tests/xfs/048                            |    4 ++--
 tests/xfs/049                            |    4 ++--
 tests/xfs/050                            |    6 +++---
 tests/xfs/052                            |    6 +++---
 tests/xfs/054                            |    6 +++---
 tests/xfs/055                            |    4 ++--
 tests/xfs/056                            |    4 ++--
 tests/xfs/057                            |    4 ++--
 tests/xfs/058                            |    4 ++--
 tests/xfs/059                            |    4 ++--
 tests/xfs/060                            |    4 ++--
 tests/xfs/061                            |    4 ++--
 tests/xfs/063                            |    8 ++++----
 tests/xfs/064                            |    6 +++---
 tests/xfs/065                            |    6 +++---
 tests/xfs/066                            |    6 +++---
 tests/xfs/067                            |    6 +++---
 tests/xfs/071                            |    4 ++--
 tests/xfs/072                            |    4 ++--
 tests/xfs/073                            |    4 ++--
 tests/xfs/078                            |    4 ++--
 tests/xfs/080                            |    4 ++--
 tests/xfs/081                            |    8 ++++----
 tests/xfs/082                            |    6 +++---
 tests/xfs/084                            |    4 ++--
 tests/xfs/085                            |    6 +++---
 tests/xfs/086                            |    6 +++---
 tests/xfs/087                            |    8 ++++----
 tests/xfs/090                            |    4 ++--
 tests/xfs/092                            |    4 ++--
 tests/xfs/094                            |    4 ++--
 tests/xfs/095                            |    6 +++---
 tests/xfs/096                            |    6 +++---
 tests/xfs/103                            |    4 ++--
 tests/xfs/104                            |    4 ++--
 tests/xfs/106                            |    6 +++---
 tests/xfs/107                            |    6 +++---
 tests/xfs/108                            |    6 +++---
 tests/xfs/109                            |    4 ++--
 tests/xfs/110                            |    4 ++--
 tests/xfs/111                            |    4 ++--
 tests/xfs/114                            |    6 +++---
 tests/xfs/115                            |    6 +++---
 tests/xfs/116                            |    6 +++---
 tests/xfs/118                            |    6 +++---
 tests/xfs/119                            |    4 ++--
 tests/xfs/121                            |    6 +++---
 tests/xfs/122                            |    2 +-
 tests/xfs/134                            |    6 +++---
 tests/xfs/136                            |    6 +++---
 tests/xfs/137                            |    4 ++--
 tests/xfs/138                            |    4 ++--
 tests/xfs/139                            |    4 ++--
 tests/xfs/140                            |    4 ++--
 tests/xfs/142                            |    6 +++---
 tests/xfs/143                            |    6 +++---
 tests/xfs/144                            |    6 +++---
 tests/xfs/145                            |    6 +++---
 tests/xfs/146                            |    6 +++---
 tests/xfs/147                            |    6 +++---
 tests/xfs/148                            |    6 +++---
 tests/xfs/149                            |    6 +++---
 tests/xfs/150                            |    6 +++---
 tests/xfs/151                            |    6 +++---
 tests/xfs/152                            |    6 +++---
 tests/xfs/153                            |    6 +++---
 tests/xfs/154                            |    6 +++---
 tests/xfs/155                            |    6 +++---
 tests/xfs/156                            |    6 +++---
 tests/xfs/157                            |    6 +++---
 tests/xfs/158                            |    6 +++---
 tests/xfs/159                            |    6 +++---
 tests/xfs/160                            |    6 +++---
 tests/xfs/161                            |    6 +++---
 tests/xfs/162                            |    6 +++---
 tests/xfs/163                            |    6 +++---
 tests/xfs/164                            |    4 ++--
 tests/xfs/165                            |    4 ++--
 tests/xfs/166                            |    4 ++--
 tests/xfs/167                            |    4 ++--
 tests/xfs/168                            |    6 +++---
 tests/xfs/170                            |    6 +++---
 tests/xfs/171                            |    6 +++---
 tests/xfs/172                            |    6 +++---
 tests/xfs/173                            |    6 +++---
 tests/xfs/174                            |    6 +++---
 tests/xfs/175                            |    8 ++++----
 tests/xfs/176                            |    8 ++++----
 tests/xfs/177                            |    6 +++---
 tests/xfs/178                            |    6 +++---
 tests/xfs/179                            |    4 ++--
 tests/xfs/180                            |    4 ++--
 tests/xfs/181                            |    6 +++---
 tests/xfs/182                            |    4 ++--
 tests/xfs/183                            |    4 ++--
 tests/xfs/185                            |    6 +++---
 tests/xfs/186                            |    6 +++---
 tests/xfs/187                            |    6 +++---
 tests/xfs/188                            |    4 ++--
 tests/xfs/189                            |    4 ++--
 tests/xfs/190                            |    4 ++--
 tests/xfs/191                            |    4 ++--
 tests/xfs/194                            |    4 ++--
 tests/xfs/195                            |    4 ++--
 tests/xfs/196                            |    6 +++---
 tests/xfs/197                            |    4 ++--
 tests/xfs/199                            |    4 ++--
 tests/xfs/200                            |    4 ++--
 tests/xfs/201                            |    4 ++--
 tests/xfs/202                            |    6 +++---
 tests/xfs/203                            |    4 ++--
 tests/xfs/205                            |    4 ++--
 tests/xfs/206                            |    4 ++--
 tests/xfs/216                            |    4 ++--
 tests/xfs/217                            |    4 ++--
 tests/xfs/220                            |    6 +++---
 tests/xfs/222                            |    4 ++--
 tests/xfs/227                            |    4 ++--
 tests/xfs/229                            |    2 +-
 tests/xfs/238                            |    4 ++--
 tests/xfs/242                            |    6 +++---
 tests/xfs/244                            |    6 +++---
 tests/xfs/250                            |    4 ++--
 tests/xfs/252                            |    6 +++---
 tests/xfs/253                            |    4 ++--
 tests/xfs/259                            |    2 +-
 tests/xfs/261                            |    6 +++---
 tests/xfs/262                            |    6 +++---
 tests/xfs/266                            |    4 ++--
 tests/xfs/267                            |    6 +++---
 tests/xfs/268                            |    6 +++---
 tests/xfs/278                            |    4 ++--
 tests/xfs/279                            |    6 +++---
 tests/xfs/281                            |    4 ++--
 tests/xfs/282                            |    4 ++--
 tests/xfs/283                            |    4 ++--
 tests/xfs/287                            |    4 ++--
 tests/xfs/290                            |    4 ++--
 tests/xfs/291                            |    4 ++--
 tests/xfs/292                            |    4 ++--
 tests/xfs/293                            |    4 ++--
 tests/xfs/295                            |    4 ++--
 tests/xfs/296                            |    6 +++---
 tests/xfs/297                            |    4 ++--
 321 files changed, 725 insertions(+), 725 deletions(-)
 rename common.attr => common/attr (100%)
 rename common.config => common/config (100%)
 rename common.defrag => common/defrag (100%)
 rename common.dmapi => common/dmapi (100%)
 rename common.dump => common/dump (100%)
 rename common.filestreams => common/filestreams (100%)
 rename common.filter => common/filter (100%)
 rename btrfs.filter => common/filter.btrfs (100%)
 rename common.log => common/log (100%)
 rename common.punch => common/punch (99%)
 rename common.quota => common/quota (100%)
 rename common.rc => common/rc (99%)
 rename common.repair => common/repair (100%)
 rename common.scsi_debug => common/scsi_debug (100%)
check +5 -5
index af6d317..cc426db 100755
@@ -133,9 +133,9 @@ fi
 export FSTYP
 
 # we need common.config
-if ! . ./common.config
+if ! . ./common/config
 then
-    echo "$iam: failed to source common.config"
+    echo "$iam: failed to source common/config"
     exit 1
 fi
 
@@ -266,10 +266,10 @@ then
     list=`echo $list | awk -f randomize.awk`
 fi
 
-# we need common.rc
-if ! . ./common.rc
+# we need common/rc
+if ! . ./common/rc
 then
-    echo "check: failed to source common.rc"
+    echo "check: failed to source common/rc"
     exit 1
 fi
 
common/attr renamed from common.attr +0 -0
similarity index 100%
rename from common.attr
rename to common/attr
common/config renamed from common.config +0 -0
similarity index 100%
rename from common.config
rename to common/config
common/defrag renamed from common.defrag +0 -0
similarity index 100%
rename from common.defrag
rename to common/defrag
common/dmapi renamed from common.dmapi +0 -0
similarity index 100%
rename from common.dmapi
rename to common/dmapi
common/dump renamed from common.dump +0 -0
similarity index 100%
rename from common.dump
rename to common/dump
common/filestreams renamed from common.filestreams +0 -0
similarity index 100%
rename from common.filestreams
rename to common/filestreams
common/filter renamed from common.filter +0 -0
similarity index 100%
rename from common.filter
rename to common/filter
common/filter.btrfs renamed from btrfs.filter +0 -0
similarity index 100%
rename from btrfs.filter
rename to common/filter.btrfs
common/log renamed from common.log +0 -0
similarity index 100%
rename from common.log
rename to common/log
common/punch renamed from common.punch +1 -1
similarity index 99%
rename from common.punch
rename to common/punch
index 7337298..cfbe576 100644
@@ -19,7 +19,7 @@
 # common functions for excersizing hole punches with extent size hints etc.
 
 # source dmap_scratch_mount etc.
-. ./common.dmapi
+. ./common/dmapi
 
 _spawn_test_file() {
 	echo "# spawning test file with $*"
common/quota renamed from common.quota +0 -0
similarity index 100%
rename from common.quota
rename to common/quota
common/rc renamed from common.rc +1 -1
similarity index 99%
rename from common.rc
rename to common/rc
index 78dbda8..3aa8742 100644
@@ -154,7 +154,7 @@ _fsck_opts()
 # we need common.config
 if [ "$iam" != "check" ]
 then
-    if ! . ./common.config
+    if ! . ./common/config
         then
         echo "$iam: failed to source common.config"
         exit 1
common/repair renamed from common.repair +0 -0
similarity index 100%
rename from common.repair
rename to common/repair
common/scsi_debug renamed from common.scsi_debug +0 -0
similarity index 100%
rename from common.scsi_debug
rename to common/scsi_debug
tests/btrfs/254 +2 -2
index ec3d2c5..c98120a 100755
@@ -38,8 +38,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 btrfs
tests/btrfs/264 +2 -2
index 46a4926..631c744 100755
@@ -38,8 +38,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
 
 _need_to_be_root
 _supported_fs btrfs
tests/btrfs/265 +2 -2
index 760f383..7a33cba 100755
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _need_to_be_root
 _supported_fs btrfs
tests/btrfs/276 +2 -2
index 2b34fa8..884152a 100755
@@ -42,8 +42,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
 _need_to_be_root
tests/btrfs/284 +3 -3
index 24b831a..d3ea567 100644
@@ -124,9 +124,9 @@ _rundefrag()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_fs btrfs
tests/btrfs/313 +2 -2
index 7b790ee..60fea68 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./btrfs.filter
+. ./common/rc
+. ./common/filter.btrfs
 
 # real QA test starts here
 
tests/ext4/271 +2 -2
index 6a0e7b1..dfb1ec9 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 ext4
tests/ext4/301 +3 -3
index 9da867f..b6c2f11 100644
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
tests/ext4/302 +3 -3
index cb8ffba..9307ab4 100644
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
tests/ext4/303 +3 -3
index f9eb8c7..84d8f7b 100644
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
tests/ext4/304 +3 -3
index ca4b849..7b90f1d 100644
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_os Linux
tests/generic/001 +2 -2
index a6659ab..35c88f2 100755
@@ -36,8 +36,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
tests/generic/002 +2 -2
index ba1a5cf..2aeebb1 100755
@@ -27,8 +27,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
tests/generic/005 +2 -2
index ba28502..de68b0d 100755
@@ -62,8 +62,8 @@ _touch()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/006 +2 -2
index 9949d84..62cc0c8 100755
@@ -49,8 +49,8 @@ _count()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/007 +2 -2
index 2d026a3..4947da6 100755
@@ -43,8 +43,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/010 +2 -2
index 3587f21..d338db6 100755
@@ -49,8 +49,8 @@ _filter_dbtest()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 [ -x $here/src/dbtest ] || _notrun "dbtest was not built for this platform"
 
tests/generic/011 +2 -2
index e5c6bbf..cad09ed 100755
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/013 +2 -2
index 984ed09..a9c07c4 100755
@@ -51,8 +51,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/generic/014 +2 -2
index 096e4e5..d7da9ab 100755
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os IRIX Linux
tests/generic/015 +2 -2
index a77d2f7..8d3fd5f 100755
@@ -31,8 +31,8 @@ tmp=/tmp/$$
 status=1	# success is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
tests/generic/020 +3 -3
index 42465d8..f166009 100755
@@ -32,9 +32,9 @@ status=0	# success is the default!
 trap "_cleanup; rm -f $tmp.* $testfile; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/generic/053 +3 -3
index 99dd1b0..b8bd9e6 100755
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
tests/generic/062 +3 -3
index 27907a9..9189a84 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/generic/068 +2 -2
index fa71cfc..1a58f5b 100755
@@ -46,8 +46,8 @@ trap "_cleanup" 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
tests/generic/069 +2 -2
index b2b18a9..c3fa862 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -rf $tmp.*; 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
tests/generic/070 +3 -3
index a1c5bf5..ad9031e 100755
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
tests/generic/074 +2 -2
index c795dc7..6df8c57 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/generic/075 +2 -2
index 8012cc1..52e6a43 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/generic/076 +2 -2
index a1847fc..a53840f 100755
@@ -48,8 +48,8 @@ _cleanup()
 trap "_cleanup; rm -f $tmp.*; 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
tests/generic/077 +3 -3
index 3113119..172ce6e 100755
@@ -41,9 +41,9 @@ _cleanup()
 trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
tests/generic/079 +3 -3
index 3faf106..a533484 100755
@@ -41,9 +41,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs generic
 _supported_os Linux
tests/generic/083 +2 -2
index 12d90f9..dfa44d0 100755
@@ -49,8 +49,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
tests/generic/088 +2 -2
index 1158b46..fce6489 100755
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter()
 {
tests/generic/089 +2 -2
index 5e8210d..c4c76e2 100755
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 addentries()
 {
tests/generic/091 +2 -2
index 755281e..cee012d 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
tests/generic/093 +3 -3
index 12ef580..a8ef52e 100755
@@ -35,9 +35,9 @@ status=1	# FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/generic/097 +2 -2
index 510477b..af3e25d 100755
@@ -59,8 +59,8 @@ _umount_and_mount()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # link correct .out file
 # This is done bacause udf and xfs print attrs in different orders.
tests/generic/099 +3 -3
index 6efa7a7..0fd28ad 100755
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 runas=$here/src/runas
 
tests/generic/100 +3 -3
index 34cfde7..123dc5f 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
@@ -45,7 +45,7 @@ _cleanup()
 _supported_fs generic
 _supported_os IRIX Linux
 
-# Use _populate_fs() in common.rc to create a directory structure.
+# Use _populate_fs() in common/rc to create a directory structure.
 TEMP_DIR=/tmp
 [ "$FSTYP" == "xfs" ] && TEMP_DIR=$TEST_DIR
 TAR_FILE=temp.tar
tests/generic/105 +3 -3
index d5b2cb2..2f99401 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # Modify as appropriate.
 _supported_fs generic
tests/generic/112 +2 -2
index 8959c8b..5f5b19d 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/generic/113 +2 -2
index b2a7317..3b33f96 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/generic/117 +3 -3
index 624bfd8..87e6987 100755
@@ -71,9 +71,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
tests/generic/120 +2 -2
index c3069f1..425fab1 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
tests/generic/123 +2 -2
index 2387676..0f5cc52 100755
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/124 +2 -2
index 65c94b4..92e7619 100755
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/125 +2 -2
index f489e96..18f5cb1 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/126 +2 -2
index 83671df..7fe5bc6 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/127 +2 -2
index 021a571..4aec379 100755
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 FSX_FILE_SIZE=262144
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
tests/generic/128 +2 -2
index 165aa00..c9c809f 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/129 +2 -2
index e74098f..fe763df 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 echo_and_run()
 {
tests/generic/130 +2 -2
index 96491f7..6870606 100755
@@ -47,8 +47,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/131 +2 -2
index 02835ab..95eb612 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/132 +2 -2
index 2abfccf..28c8b9a 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/133 +2 -2
index 478419c..ba386dc 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/135 +2 -2
index b5854f4..1b83465 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/141 +2 -2
index cb7aae2..39400de 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/169 +2 -2
index 6293654..0a07053 100755
@@ -48,8 +48,8 @@ _show_wrote_and_stat_only()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/184 +2 -2
index 929e0eb..5d74fa3 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/192 +2 -2
index 4b9d0bb..66d8a66 100755
@@ -39,8 +39,8 @@ _access_time()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/193 +2 -2
index 8b3b9db..58d1bc6 100755
@@ -58,8 +58,8 @@ _cleanup_files()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/198 +2 -2
index 5aac37f..5190d34 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
tests/generic/204 +2 -2
index ae87930..62bd248 100755
@@ -30,8 +30,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/207 +2 -2
index b520bee..0709061 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/208 +2 -2
index 4c34e7b..badd522 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/209 +2 -2
index 82d5e6a..2abafcf 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/210 +2 -2
index 16908cc..ebeb137 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/211 +2 -2
index 6d7b996..d1110f5 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/212 +2 -2
index 6e86e94..23ceae0 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/213 +2 -2
index 1fa573c..a0bfd16 100755
@@ -41,8 +41,8 @@ status=1	# failure is the default!
 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
 # generic, but xfs_io's fallocate must work
tests/generic/214 +2 -2
index bcd75f8..a19fb59 100755
@@ -39,8 +39,8 @@ status=1	# failure is the default!
 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
 # generic, but xfs_io's fallocate must work
tests/generic/215 +2 -2
index 73cdd14..6e75645 100755
@@ -39,8 +39,8 @@ status=1	# failure is the default!
 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
tests/generic/219 +3 -3
index b71d13d..071d798 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
tests/generic/221 +1 -1
index 7fca5bb..e7d4740 100755
@@ -34,7 +34,7 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
tests/generic/223 +2 -2
index a6932da..416a14a 100755
@@ -38,8 +38,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
tests/generic/224 +2 -2
index 313d9c2..391d877 100755
@@ -44,8 +44,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
tests/generic/225 +2 -2
index ea44f2e..9311571 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/226 +1 -1
index da45c9e..8b8f101 100755
@@ -32,7 +32,7 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 _supported_fs generic
 _supported_os Linux IRIX
tests/generic/228 +1 -1
index c8af133..ca375f4 100755
@@ -40,7 +40,7 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15 25
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 # generic, but xfs_io's fallocate must work
tests/generic/230 +3 -3
index 51f6d85..f6883c0 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
tests/generic/231 +3 -3
index 1a434d4..b50412c 100755
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -N 20000"
tests/generic/232 +3 -3
index 0f72733..ee0e16e 100755
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _filter_num()
 {
tests/generic/233 +3 -3
index 20ba711..1eb68c5 100755
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
tests/generic/234 +3 -3
index e5c94e9..eb0871f 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 test_setting()
 {
tests/generic/235 +3 -3
index 85ed782..f430ba2 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs generic
tests/generic/236 +1 -1
index 016afae..10cf71a 100755
@@ -37,7 +37,7 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
tests/generic/237 +3 -3
index 7e54aed..e5c5a79 100755
@@ -34,9 +34,9 @@ status=1        # FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/generic/239 +2 -2
index e25a6a0..bf39953 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
tests/generic/240 +2 -2
index 77fffe8..e692318 100755
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
tests/generic/241 +2 -2
index b55344b..7c3f6e8 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
tests/generic/245 +2 -2
index 9832e92..2d888de 100755
@@ -33,8 +33,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/246 +2 -2
index 872e513..dd809fb 100755
@@ -34,8 +34,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/247 +2 -2
index 8a7e2c6..295259f 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/248 +2 -2
index 7bb42a1..873313d 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/249 +2 -2
index 288328c..6ba7ddb 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/251 +2 -2
index 95633e1..7eeeedc 100755
@@ -37,8 +37,8 @@ chpid=0
 mypid=$$
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/255 +3 -3
index 3ef2449..2e8ddef 100755
@@ -38,9 +38,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs generic 
tests/generic/256 +3 -3
index d60584b..ceeab0a 100755
@@ -38,9 +38,9 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/punch
 
 # real QA test starts here
 _supported_fs generic
tests/generic/257 +2 -2
index 09a8fd8..a9ce73b 100755
@@ -36,8 +36,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
tests/generic/258 +1 -1
index ac03bb5..fb091ae 100755
@@ -40,7 +40,7 @@ _cleanup()
 trap "_cleanup ; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs generic
tests/generic/260 +2 -2
index d69e176..3c36996 100755
@@ -34,8 +34,8 @@ chpid=0
 mypid=$$
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/263 +2 -2
index 3e86efc..377b199 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
tests/generic/269 +2 -2
index 785d4de..6e33368 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
 _workout()
tests/generic/270 +3 -3
index e6dbd8e..294bb62 100755
@@ -33,9 +33,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
tests/generic/273 +2 -2
index 3cfd3b0..d149808 100755
@@ -39,8 +39,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 threads=50
 count=2
tests/generic/274 +2 -2
index d5f09a4..5f3a51c 100755
@@ -41,8 +41,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/275 +2 -2
index 7782840..f83a644 100755
@@ -39,8 +39,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
tests/generic/277 +2 -2
index b85e429..8461ad9 100755
@@ -36,8 +36,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
tests/generic/280 +3 -3
index 4b1e9b1..5491a6b 100755
@@ -38,9 +38,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _require_scratch
 _require_quota
tests/generic/285 +2 -2
index 93d793a..22b4a08 100644
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
tests/generic/286 +2 -2
index 07ac029..a0d4df9 100644
@@ -31,8 +31,8 @@ status=1	# failure is the default!
 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
tests/generic/288 +2 -2
index 175b9ef..7230358 100644
@@ -30,8 +30,8 @@ status=0
 trap "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
tests/generic/294 +2 -2
index d4986d2..fa7f339 100644
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/generic/299 +2 -2
index 532a301..5f3edc4 100644
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
tests/generic/300 +2 -2
index a9fedbd..687e62d 100644
@@ -34,8 +34,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
tests/shared/051 +3 -3
index 0671f83..df90be9 100755
@@ -32,9 +32,9 @@ status=1	# FAILure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/shared/218 +3 -3
index 7c2bd53..c8b3f7d 100755
@@ -38,9 +38,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.defrag
+. ./common/rc
+. ./common/filter
+. ./common/defrag
 
 # real QA test starts here
 _supported_fs xfs ext4 btrfs
tests/shared/243 +2 -2
index 4884e29..05edc1e 100755
@@ -113,8 +113,8 @@ _check_ext4_eof_flag()
 }
 
 # Get standard environment, filters and checks.
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # Prerequisites for the test run.
 _supported_fs ext4 xfs btrfs gfs2
tests/shared/272 +2 -2
index 93a4967..0f812f3 100755
@@ -37,8 +37,8 @@ write_opt_list="iflag=noatime conv=notrunc conv=fsync"
 [ $FSTYP = "ext4" ] && write_opt_list="$write_opt_list oflag=direct"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 _workout()
 {
 	echo "Switch data journalling mode. Silence is golden."
tests/shared/289 +2 -2
index 091bceb..1879865 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/shared/298 +2 -2
index c5d1117..f1a3432 100644
@@ -28,8 +28,8 @@ echo "QA output created by $seq"
 status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-. common.config
-. common.rc
+. common/config
+. common/rc
 
 _supported_fs ext4 xfs
 _supported_os Linux
tests/shared/305 +3 -3
index 49a06cc..bcb235f 100644
@@ -32,15 +32,15 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 _supported_fs ext3 ext4 xfs btrfs reiserfs
 _supported_os Linux
 _need_to_be_root
 _require_scratch
 _require_fail_make_request
 
-# TODO: Function are common enough to be moved to common.blkdev
+# TODO: Function are common enough to be moved to common/blkdev
 SCRATCH_REAL_DEV=`readlink -f $SCRATCH_DEV`
 SCRATCH_BDEV=`basename $SCRATCH_REAL_DEV`
 
tests/udf/098 +2 -2
index 0cdcd16..9ae3614 100755
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _db_filter()
 {
tests/udf/101 +2 -2
index 89507a9..0f5fe87 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs udf 
tests/udf/102 +2 -2
index bf3edd2..e27c086 100755
@@ -39,8 +39,8 @@ _cleanup()
     _cleanup_testdir
 }
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs udf 
tests/xfs/003 +2 -2
index 56dd852..228dd17 100755
@@ -27,8 +27,8 @@ seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 here=`pwd`
tests/xfs/004 +2 -2
index fb02b95..eb038b8 100755
@@ -54,8 +54,8 @@ _populate_scratch()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/008 +2 -2
index 1f66779..4bf6c00 100755
@@ -46,8 +46,8 @@ _filter()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/xfs/009 +2 -2
index 3e74160..f6031c4 100755
@@ -71,8 +71,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/012 +2 -2
index 4bd2afc..87c0b85 100755
@@ -45,8 +45,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
tests/xfs/016 +2 -2
index fcb0637..2fc6af2 100755
@@ -171,8 +171,8 @@ _check_corrupt()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/017 +2 -2
index 98ae7e6..9fc16c2 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/018 +3 -3
index 7f22b54..60a1a64 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 _cleanup()
 {
tests/xfs/019 +2 -2
index ff69423..d35d15b 100755
@@ -31,8 +31,8 @@ tmp=/tmp/$$
 seqfull="$seqres.full"
 status=1	# failure is the default!
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
tests/xfs/021 +3 -3
index 3cbf088..a727b51 100755
@@ -30,9 +30,9 @@ here=`pwd`
 tmp=/tmp/$$
 status=0	# success is the default!
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _cleanup()
 {
tests/xfs/022 +2 -2
index 39f4b02..cd9b9ec 100755
@@ -35,8 +35,8 @@ tmp=/tmp/$$
 status=0	# success is the default!
 trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/023 +2 -2
index b133055..120be64 100755
@@ -34,8 +34,8 @@ status=0	# success is the default!
 trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/024 +2 -2
index ec5edc5..68e9788 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/025 +2 -2
index 1e44732..ff29b99 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/026 +2 -2
index 04bda76..4cd7789 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/027 +2 -2
index 712378d..1005683 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/028 +2 -2
index e70bc57..34c23e3 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/029 +2 -2
index 4916c33..0709fce 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter_logprint()
 {
tests/xfs/030 +3 -3
index b189128..c81925e 100755
@@ -41,9 +41,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/031 +3 -3
index 0f9a545..ef60367 100755
@@ -34,9 +34,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.repair
-. ./common.filter
+. ./common/rc
+. ./common/repair
+. ./common/filter
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/032 +2 -2
index 343ff44..d255b66 100755
@@ -33,8 +33,8 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/033 +3 -3
index e95cae4..bf906e0 100755
@@ -41,9 +41,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/034 +2 -2
index 372dead..6f73fdd 100755
@@ -40,8 +40,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 xfs
tests/xfs/035 +2 -2
index de9b9df..70eac93 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/036 +2 -2
index 1578e8e..32b8c87 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/037 +2 -2
index ca10429..ff736d5 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/038 +2 -2
index 64d2428..107e802 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/039 +2 -2
index ebab798..9747923 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/040 +2 -2
index 119a770..7c2a008 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 [ -z "$KWORKAREA" ] && \
 	_notrun "Can't run srcdiff without KWORKAREA set"
tests/xfs/041 +2 -2
index dd50301..8b109fc 100755
@@ -41,8 +41,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 xfs
tests/xfs/042 +2 -2
index 1127b46..db0fa28 100755
@@ -41,8 +41,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 xfs
tests/xfs/043 +2 -2
index 9c56ac1..55a5225 100755
@@ -35,8 +35,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/044 +2 -2
index 3b330b9..2c20122 100755
@@ -36,8 +36,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 xfs
tests/xfs/045 +2 -2
index 9d07570..7a2ad45 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _get_existing_uuid()
 {
tests/xfs/046 +2 -2
index d5f4fca..841c12b 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/047 +2 -2
index 18960ea..d7c0dce 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/048 +2 -2
index a39ec66..40667e0 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
tests/xfs/049 +2 -2
index 6bbee3c..850d371 100755
@@ -46,8 +46,8 @@ status=1	# failure is the default!
 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 xfs
tests/xfs/050 +3 -3
index 669a624..774ed28 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
tests/xfs/052 +3 -3
index 2abd78d..c2cf596 100755
@@ -34,9 +34,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
tests/xfs/054 +3 -3
index 97590e8..8c18050 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
tests/xfs/055 +2 -2
index 4c04b0a..cc747d3 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # link correct .out file
 _link_out_file $seq.out $seqfull.out
tests/xfs/056 +2 -2
index 8ab61f9..7e2624a 100755
@@ -33,8 +33,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/057 +2 -2
index fd856d7..a525ef7 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _notrun "Place holder for IRIX test 057"
 
tests/xfs/058 +2 -2
index c800286..89c441a 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _notrun "Place holder for IRIX test 058"
 
tests/xfs/059 +2 -2
index c26fa4d..69338ac 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/060 +2 -2
index 6adce78..477b964 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/061 +2 -2
index e5a8413..2600f03 100755
@@ -32,8 +32,8 @@ status=0	# success is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.dump
+. ./common/rc
+. ./common/dump
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/063 +4 -4
index a2ee188..8494f8f 100755
@@ -32,10 +32,10 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/dump
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/064 +3 -3
index 9ba542e..f06eda7 100755
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 
 _ls_size_filter()
tests/xfs/065 +3 -3
index ef1d10f..10e9b15 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 #
 # list recursively the directory
tests/xfs/066 +3 -3
index 8709a2b..6d4e1c2 100755
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dump
+. ./common/rc
+. ./common/filter
+. ./common/dump
 
 _cleanup()
 {
tests/xfs/067 +3 -3
index 87b3cc9..fbfaa1f 100755
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/071 +2 -2
index cc0dd20..86c6899 100755
@@ -40,8 +40,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
 
 bitsperlong=`src/feature -w`
 # link correct .out file
tests/xfs/072 +2 -2
index d5bec3c..9949749 100755
@@ -39,8 +39,8 @@ status=1	# failure is the default!
 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 xfs
tests/xfs/073 +2 -2
index 2ed2e97..1516639 100755
@@ -31,8 +31,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # don't put fs images in /tmp
 imgs=$TEST_DIR/$$
tests/xfs/078 +2 -2
index df4fc6f..90a4a00 100755
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # loop devices are available in Linux only
 _supported_fs xfs
tests/xfs/080 +2 -2
index fb5b6a6..b1cd0cb 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 { 
tests/xfs/081 +4 -4
index 44018bc..bdab460 100755
@@ -31,10 +31,10 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/log
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/082 +3 -3
index 9ab1611..fff1d6b 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 _cleanup()
 {
tests/xfs/084 +2 -2
index 46aa837..0d17cf3 100755
@@ -33,8 +33,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _filter_resv()
 {
tests/xfs/085 +3 -3
index a02c42d..27f29a3 100755
@@ -35,9 +35,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/086 +3 -3
index 2e2d4cf..af09c7f 100755
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/087 +4 -4
index 65812f6..3a3fb49 100755
@@ -34,10 +34,10 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/log
+. ./common/quota
 
 _do_meta()
 {
tests/xfs/090 +2 -2
index 8477329..e8074d0 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 xfs
tests/xfs/092 +2 -2
index e65fe27..f195077 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/094 +2 -2
index 6aa2d74..cb27559 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/095 +3 -3
index 9a74d5f..d137358 100755
@@ -38,9 +38,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 
tests/xfs/096 +3 -3
index 42673c5..d161019 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 #
 # filter out counts which will vary
tests/xfs/103 +2 -2
index 2d4fd48..ab54cbf 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _create_scratch()
 {
tests/xfs/104 +2 -2
index b0588e8..d31cf16 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _create_scratch()
 {
tests/xfs/106 +3 -3
index 651fe00..92c419d 100755
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _supported_fs xfs
 _supported_os Linux #IRIX
tests/xfs/107 +3 -3
index e2300ce..3fefe51 100755
@@ -34,9 +34,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 filter_xfs_quota()
 {
tests/xfs/108 +3 -3
index 809659d..5a47009 100755
@@ -32,9 +32,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/109 +2 -2
index 2e36d0f..5578c90 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 xfs
tests/xfs/110 +2 -2
index a2790c8..48bea45 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 xfs
tests/xfs/111 +2 -2
index af7cd65..bedead8 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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 xfs
tests/xfs/114 +3 -3
index 954eaff..4dfdf86 100755
@@ -305,9 +305,9 @@ _test_dirstress()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs xfs
 _supported_os IRIX
tests/xfs/115 +3 -3
index aa281d6..0933c54 100755
@@ -92,9 +92,9 @@ _filter()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 _supported_fs xfs
 _supported_os IRIX
tests/xfs/116 +3 -3
index 4554d20..6aaae95 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 
tests/xfs/118 +3 -3
index e4ce711..abbb090 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 
tests/xfs/119 +2 -2
index 066ddbd..c7c46d9 100755
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/121 +3 -3
index f6dc83a..1e06e45 100755
@@ -36,9 +36,9 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/122 +1 -1
index 2a81728..8f1d5b4 100755
@@ -34,7 +34,7 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment
-. ./common.rc
+. ./common/rc
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/134 +3 -3
index f38fc6e..298245f 100755
@@ -32,9 +32,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _cleanup()
 {
tests/xfs/136 +3 -3
index ec3f71a..9009c7b 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
tests/xfs/137 +2 -2
index 5c0fc51..90dc1f5 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/138 +2 -2
index a0aeb82..d3c1009 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/139 +2 -2
index 9de1fca..1fbde58 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/140 +2 -2
index 8564b28..ce52272 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/142 +3 -3
index e09ae3f..5a2ef9e 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/143 +3 -3
index 686be64..c86cc0a 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/144 +3 -3
index cf5eca7..0b5b21d 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/145 +3 -3
index 2a4b2f6..c8444f0 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/146 +3 -3
index e79d59e..1e13d95 100755
@@ -44,9 +44,9 @@ _report_filter () {
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/147 +3 -3
index c65dde9..c22f24a 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/148 +3 -3
index 49892ab..c60d219 100755
@@ -41,9 +41,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 [ -z "$XFS_PARALLEL_REPAIR64_PROG" ] && _notrun "parallel repair binary xfs_prepair64 is not installed"
 
tests/xfs/149 +3 -3
index 780e3ae..fe6b70e 100755
@@ -34,9 +34,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.repair
-. ./common.filter
+. ./common/rc
+. ./common/repair
+. ./common/filter
 
 [ -z "$XFS_PARALLEL_REPAIR_PROG" ] && _notrun "parallel repair binary xfs_prepair is not installed"
 
tests/xfs/150 +3 -3
index 529b6b4..3bf1c8b 100755
@@ -42,9 +42,9 @@ _filter_fs_handle()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/151 +3 -3
index 9de8ab4..d2e21f3 100755
@@ -63,9 +63,9 @@ _check_sids()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/152 +3 -3
index 4b9d471..310f0dc 100755
@@ -43,9 +43,9 @@ _filter_handles()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/153 +3 -3
index 86df036..7b9a316 100755
@@ -38,9 +38,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/154 +3 -3
index 528ec9c..c281b37 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/155 +3 -3
index 1c4ea6c..23316f2 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/156 +3 -3
index 0a73b6b..88b8cbf 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/157 +3 -3
index 91819ef..a1243dc 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/158 +3 -3
index ef8d4d1..5c4dfcd 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/159 +3 -3
index 8f80482..8d15162 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/160 +3 -3
index 2323697..44e9f2f 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/161 +3 -3
index 45210c7..74d6dbe 100755
@@ -44,9 +44,9 @@ _filter_get_allocinfo()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/162 +3 -3
index 67aec9a..64d001c 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/163 +3 -3
index 434f100..a8cb06a 100755
@@ -48,9 +48,9 @@ _filter_handles()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/164 +2 -2
index 8af0b0d..cfd77fa 100755
@@ -61,8 +61,8 @@ _filter_bmap()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/165 +2 -2
index 72376f3..7806a33 100755
@@ -57,8 +57,8 @@ _filter_bmap()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/166 +2 -2
index 3170fa6..02b3237 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # assumes 1st, 3rd and 5th blocks are single written blocks,
 # the others are unwritten.
tests/xfs/167 +2 -2
index 6800d24..d75de23 100755
@@ -50,8 +50,8 @@ workout()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/168 +3 -3
index 67f1e19..4ca2869 100755
@@ -62,9 +62,9 @@ s/^\s*\n//g ;
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/170 +3 -3
index f470946..f772bc4 100755
@@ -41,9 +41,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/171 +3 -3
index af7a216..a6151f0 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/172 +3 -3
index 50eda81..43ef5ab 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/173 +3 -3
index 6761a8a..8c4f9a6 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/174 +3 -3
index ffb6754..5e2e61b 100755
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.filestreams
+. ./common/rc
+. ./common/filter
+. ./common/filestreams
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/175 +4 -4
index 4753f21..16fcfcc 100755
@@ -41,10 +41,10 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/176 +4 -4
index 3fe9f04..ea07e00 100755
@@ -38,10 +38,10 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
-. ./common.punch
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
+. ./common/punch
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/177 +3 -3
index 49ca282..2558201 100755
@@ -39,9 +39,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 
tests/xfs/178 +3 -3
index 084aeb9..9db8d05 100755
@@ -53,9 +53,9 @@ _dd_repair_check()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # real QA test starts here
 
tests/xfs/179 +2 -2
index 451d7cc..6402eda 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/180 +2 -2
index 15e0221..404f352 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/181 +3 -3
index 35e808f..38d556c 100755
@@ -43,9 +43,9 @@ status=1	# failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.log
+. ./common/rc
+. ./common/filter
+. ./common/log
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/182 +2 -2
index 7495eb1..f55e018 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/183 +2 -2
index 5a7587f..764c1d5 100755
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/185 +3 -3
index f00858b..7905801 100755
@@ -37,9 +37,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.dmapi
+. ./common/rc
+. ./common/filter
+. ./common/dmapi
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/186 +3 -3
index 46cd087..44edaf7 100755
@@ -136,9 +136,9 @@ _changeto_attr1()
 
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
tests/xfs/187 +3 -3
index c414017..9cf1305 100755
@@ -48,9 +48,9 @@ _filter_version()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/188 +2 -2
index a8fe431..6332085 100755
@@ -46,8 +46,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/189 +2 -2
index 24cc29e..af6a16a 100755
@@ -192,8 +192,8 @@ _putback_scratch_fstab()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/190 +2 -2
index c760ee6..614a80c 100755
@@ -44,8 +44,8 @@ status=0    # success is the default!
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/191 +2 -2
index d3b227c..e9aef20 100755
@@ -32,8 +32,8 @@ status=1	# failure is the default!
 trap "rm -f $tmp.*; 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
 
tests/xfs/194 +2 -2
index 4609a17..f56702a 100755
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # only xfs supported due to use of xfs_bmap
 _supported_fs xfs
tests/xfs/195 +2 -2
index e0755f4..d67ce9f 100755
@@ -56,8 +56,8 @@ _do_dump()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/196 +3 -3
index 20b20b2..189f4ce 100755
@@ -41,9 +41,9 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/197 +2 -2
index b17ea37..bc2de9d 100755
@@ -42,8 +42,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 xfs
tests/xfs/199 +2 -2
index fbca7c6..1d64e02 100755
@@ -40,8 +40,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 xfs
tests/xfs/200 +2 -2
index a70fcfe..5d4d94c 100755
@@ -37,8 +37,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 xfs
tests/xfs/201 +2 -2
index 3f5b1fb..fa7bcf6 100755
@@ -50,8 +50,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 xfs
tests/xfs/202 +3 -3
index b0591d3..15c6603 100755
@@ -30,9 +30,9 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.repair
+. ./common/rc
+. ./common/filter
+. ./common/repair
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/203 +2 -2
index 98ee792..7e18ca3 100755
@@ -65,8 +65,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 rm -f $seqres.full
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/205 +2 -2
index 8b973c2..c9b73a1 100755
@@ -30,8 +30,8 @@ tmp=/tmp/$$
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
tests/xfs/206 +2 -2
index 909a908..fcbdd9e 100755
@@ -45,8 +45,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
tests/xfs/216 +2 -2
index 486bd9d..a21df9d 100755
@@ -38,8 +38,8 @@ _cleanup()
 }
 
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

tests/xfs/217 +2 -2
index 25d3a15..25a6c01 100755

Lines of this file are not shown. View the raw message.

tests/xfs/220 +3 -3
index a696aa0..181a10a 100755

Lines of this file are not shown. View the raw message.

tests/xfs/222 +2 -2
index 556baff..0e5aaf6 100755

Lines of this file are not shown. View the raw message.

tests/xfs/227 +2 -2
index 650c72e..3816e9f 100755

Lines of this file are not shown. View the raw message.

tests/xfs/229 +1 -1
index eef6a2d..3e02421 100755

Lines of this file are not shown. View the raw message.

tests/xfs/238 +2 -2
index 00dd620..0bbda8f 100755

Lines of this file are not shown. View the raw message.

tests/xfs/242 +3 -3
index 6476d5a..80b0b1d 100755

Lines of this file are not shown. View the raw message.

tests/xfs/244 +3 -3
index 566caaa..d899a3d 100755

Lines of this file are not shown. View the raw message.

tests/xfs/250 +2 -2
index a6edc2d..b9953f7 100755

Lines of this file are not shown. View the raw message.

tests/xfs/252 +3 -3
index be3bfcf..7015f87 100755

Lines of this file are not shown. View the raw message.

tests/xfs/253 +2 -2
index 7c221a5..98c61d6 100755

Lines of this file are not shown. View the raw message.

tests/xfs/259 +1 -1
index 6a29230..59eeaca 100755

Lines of this file are not shown. View the raw message.

tests/xfs/261 +3 -3
index 7c575aa..950c539 100755

Lines of this file are not shown. View the raw message.

tests/xfs/262 +3 -3
index 2ed7123..01f7f8b 100755

Lines of this file are not shown. View the raw message.

tests/xfs/266 +2 -2
index 3efbb75..70d4b7f 100755

Lines of this file are not shown. View the raw message.

tests/xfs/267 +3 -3
index 05360a9..65e5321 100755

Lines of this file are not shown. View the raw message.

tests/xfs/268 +3 -3
index c0c45f2..bc2bb62 100755

Lines of this file are not shown. View the raw message.

tests/xfs/278 +2 -2
index 6439eb4..6aa0e4d 100755

Lines of this file are not shown. View the raw message.

tests/xfs/279 +3 -3
index e96c823..872f8be 100755

Lines of this file are not shown. View the raw message.

tests/xfs/281 +2 -2
index 7aae2a5..fbfa06e 100755

Lines of this file are not shown. View the raw message.

tests/xfs/282 +2 -2
index 0680b9c..8ddb258 100755

Lines of this file are not shown. View the raw message.

tests/xfs/283 +2 -2
index 75ee26e..cd9609e 100755

Lines of this file are not shown. View the raw message.

tests/xfs/287 +2 -2
index 7e68045..10853d1 100644

Lines of this file are not shown. View the raw message.

tests/xfs/290 +2 -2
index 7198b72..547a0ba 100644

Lines of this file are not shown. View the raw message.

tests/xfs/291 +2 -2
index 4871eaa..f842679 100644

Lines of this file are not shown. View the raw message.

tests/xfs/292 +2 -2
index b617c9d..d67db47 100644

Lines of this file are not shown. View the raw message.

tests/xfs/293 +2 -2
index 5aa350b..d1a2853 100644

Lines of this file are not shown. View the raw message.

tests/xfs/295 +2 -2
index bb2fe73..79f27bd 100644

Lines of this file are not shown. View the raw message.

tests/xfs/296 +3 -3
index 24ee1c8..610c2ec 100644

Lines of this file are not shown. View the raw message.

tests/xfs/297 +2 -2
index 6240ca7..3fe32f1 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Part of the diff is not shown here. View the raw message.

#47 lore raw

PATCH 21/25 xfstests: Reintroduce configurable test expunging.

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

It is definitely handy to be able to disabdle certain tests (e.g. tests that are known to hang or crash the test machine on certain kernels), so re-introducing the capability of avoiding certain tests just by placing them in a file is useful.

Introduce a command line option to specify the expunged file name. The file will exist in each tests/* sub-directory so that only the testname is required, and can be managed independently. The use of a command line parameter allows multiple expunge files to exist simultaneously in the one xfstests tree which simplifies management of a source repository used for multiple versions of a distro.

Typical usage:

$ cat tests/generic/3.0-stable-avoid
280
$ sudo ./check -X 3.0-stable-avoid generic/280
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test-1 3.0.39-dgc+
MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch

generic/280 [expunged]
Passed all 0 tests
$

Eventually we should be able to automate setting up expunged files based on distro release or kernel version through this infrastructure.

---
 check |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 15 deletions(-)
check +44 -15
index cc426db..17bc004 100755
@@ -34,6 +34,7 @@ have_test_arg=false
 randomize=false
 here=`pwd`
 FSTYP=xfs
+xfile=""
 
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
 SRC_GROUPS="generic shared"
@@ -72,6 +73,7 @@ check options
 testlist options
     -g group[,group...]	include tests from these groups
     -x group[,group...]	exclude tests from these groups
+    -X file		exclude individual tests
     [testlist]		include tests matching names in testlist
 '
 	    exit 0
@@ -110,6 +112,30 @@ get_all_tests()
 	done
 }
 
+# takes the list of tests to run in $tmp.list, and removes the tests passed to
+# the function from that list.
+trim_test_list()
+{
+	test_list="$*"
+
+	rm -f $tmp.grep
+	numsed=0
+	for t in $test_list
+	do
+	    if [ $numsed -gt 100 ]; then
+		grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+		mv $tmp.tmp $tmp.list
+		numsed=0
+		rm -f $tmp.grep
+	    fi
+	    echo "^$t\$" >>$tmp.grep
+	    numsed=`expr $numsed + 1`
+	done
+	grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+	mv $tmp.tmp $tmp.list
+}
+
+
 _wallclock()
 {
     date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
@@ -124,7 +150,7 @@ _timestamp()
 # start the initialisation work now
 _setenvironment
 
-rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
 
 # Autodetect fs type based on what's on $TEST_DEV
 if [ "$HOSTOS" == "Linux" ]; then
@@ -177,21 +203,16 @@ while [ $# -gt 0 ]; do
 		    exit 1
 		fi
 
-		rm -f $tmp.grep
-		numsed=0
-		for t in $group_list
-		do
-		    if [ $numsed -gt 100 ]; then
-			grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
-			mv $tmp.tmp $tmp.list
-			numsed=0
-			rm -f $tmp.grep
-		    fi
-		    echo "^$t\$" >>$tmp.grep
-		    numsed=`expr $numsed + 1`
+		trim_test_list $group_list
+		;;
+
+	-X)	xfile=$2; shift ;
+		for d in $SRC_GROUPS $FSTYP; do
+			[ -f $SRC_DIR/$d/$xfile ] || continue
+			for f in `cat $SRC_DIR/$d/$xfile`; do
+				echo $d/$f >> $tmp.xlist
+			done
 		done
-		grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
-		mv $tmp.tmp $tmp.list
 		;;
 
 	-l)	diff="diff" ;;
@@ -413,6 +434,14 @@ do
 	#
 	rm -f $seqres.out.bad
 
+	# check if we really should run it
+	if [ -s $tmp.xlist ]; then
+		if grep $seqnum $tmp.xlist > /dev/null 2>&1 ; then
+			echo "       [expunged]"
+			continue
+		fi
+	fi
+
 	# slashes now in names, sed barfs on them so use grep
 	lasttime=`grep -w ^$seq check.time | awk '// {print $2}'`
 	if [ "X$lasttime" != X ]; then
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 21/25
#48 lore raw

Re: [PATCH 21/25] xfstests: Reintroduce configurable test expunging.

Looks OK.

Quoted 149 lines · Dave Chinner

From: Dave Chinner <[email protected]>

It is definitely handy to be able to disabdle certain tests (e.g. tests that are known to hang or crash the test machine on certain kernels), so re-introducing the capability of avoiding certain tests just by placing them in a file is useful.

Introduce a command line option to specify the expunged file name. The file will exist in each tests/* sub-directory so that only the testname is required, and can be managed independently. The use of a command line parameter allows multiple expunge files to exist simultaneously in the one xfstests tree which simplifies management of a source repository used for multiple versions of a distro.

Typical usage:

$ cat tests/generic/3.0-stable-avoid
280
$ sudo ./check -X 3.0-stable-avoid generic/280
FSTYP         -- xfs (debug)
PLATFORM      -- Linux/x86_64 test-1 3.0.39-dgc+
MKFS_OPTIONS  -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch

generic/280 [expunged]
Passed all 0 tests
$

Eventually we should be able to automate setting up expunged files based on distro release or kernel version through this infrastructure.

---
 check |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 15 deletions(-)
check +44 -15
index cc426db..17bc004 100755
@@ -34,6 +34,7 @@ have_test_arg=false
 randomize=false
 here=`pwd`
 FSTYP=xfs
+xfile=""
 
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
 SRC_GROUPS="generic shared"
@@ -72,6 +73,7 @@ check options
 testlist options
     -g group[,group...]	include tests from these groups
     -x group[,group...]	exclude tests from these groups
+    -X file		exclude individual tests
     [testlist]		include tests matching names in testlist
 '
 	    exit 0
@@ -110,6 +112,30 @@ get_all_tests()
 	done
 }
 
+# takes the list of tests to run in $tmp.list, and removes the tests passed to
+# the function from that list.
+trim_test_list()
+{
+	test_list="$*"
+
+	rm -f $tmp.grep
+	numsed=0
+	for t in $test_list
+	do
+	    if [ $numsed -gt 100 ]; then
+		grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+		mv $tmp.tmp $tmp.list
+		numsed=0
+		rm -f $tmp.grep
+	    fi
+	    echo "^$t\$" >>$tmp.grep
+	    numsed=`expr $numsed + 1`
+	done
+	grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+	mv $tmp.tmp $tmp.list
+}
+
+
 _wallclock()
 {
     date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
@@ -124,7 +150,7 @@ _timestamp()
 # start the initialisation work now
 _setenvironment
 
-rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
 
 # Autodetect fs type based on what's on $TEST_DEV
 if [ "$HOSTOS" == "Linux" ]; then
@@ -177,21 +203,16 @@ while [ $# -gt 0 ]; do
 		    exit 1
 		fi
 
-		rm -f $tmp.grep
-		numsed=0
-		for t in $group_list
-		do
-		    if [ $numsed -gt 100 ]; then
-			grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
-			mv $tmp.tmp $tmp.list
-			numsed=0
-			rm -f $tmp.grep
-		    fi
-		    echo "^$t\$" >>$tmp.grep
-		    numsed=`expr $numsed + 1`
+		trim_test_list $group_list
+		;;
+
+	-X)	xfile=$2; shift ;
+		for d in $SRC_GROUPS $FSTYP; do
+			[ -f $SRC_DIR/$d/$xfile ] || continue
+			for f in `cat $SRC_DIR/$d/$xfile`; do
+				echo $d/$f >> $tmp.xlist
+			done
 		done
-		grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
-		mv $tmp.tmp $tmp.list
 		;;
 
 	-l)	diff="diff" ;;
@@ -413,6 +434,14 @@ do
 	#
 	rm -f $seqres.out.bad
 
+	# check if we really should run it
+	if [ -s $tmp.xlist ]; then
+		if grep $seqnum $tmp.xlist > /dev/null 2>&1 ; then
+			echo "       [expunged]"
+			continue
+		fi
+	fi
+
 	# slashes now in names, sed barfs on them so use grep
 	lasttime=`grep -w ^$seq check.time | awk '// {print $2}'`
 	if [ "X$lasttime" != X ]; then
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#49 lore raw

PATCH 22/25 xfstests: RESULTS_DIR needs to be an absolute path

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

Some tests 'cd <somedir>' and then direct output to $RESULT_DIR, which fails if the current working directory is not $here. Regardless, if an external results directory is to be used it needs to have a full path specified and the use of $here as the base of the results files is completely incorrect.

Hence change all the $here/$seqres* references to simply be $seqres*, and instead encode the full path to the results in $RESULT_DIR.

---
 check              |   55 ++++++++++++-----------------
 common/attr        |    4 +--
 common/defrag      |    4 +--
 common/dump        |   86 ++++++++++++++++++++++-----------------------
 common/filestreams |    4 +--
 common/log         |   36 +++++++++----------
 common/quota       |   18 +++++-----
 common/rc          |   98 ++++++++++++++++++++++++++--------------------------
 common/scsi_debug  |    2 +-
 tests/generic/001  |    8 ++---
 tests/generic/010  |    2 +-
 tests/generic/013  |   12 +++----
 tests/generic/074  |    2 +-
 tests/generic/075  |   10 +++---
 tests/generic/089  |    4 +--
 tests/generic/100  |    8 ++---
 tests/generic/112  |    4 +--
 tests/generic/192  |    2 +-
 tests/generic/232  |    8 ++---
 tests/generic/233  |    8 ++---
 tests/generic/269  |    4 +--
 tests/generic/270  |    4 +--
 tests/shared/305   |   12 +++----
 tests/xfs/008      |   18 +++++-----
 tests/xfs/012      |   30 ++++++++--------
 tests/xfs/024      |    4 +--
 tests/xfs/067      |    6 ++--
 tests/xfs/114      |   30 ++++++++--------
 tests/xfs/115      |    8 ++---
 tests/xfs/168      |    2 +-
 tests/xfs/186      |    4 +--
 tests/xfs/282      |    4 +--
 tests/xfs/283      |    4 +--
 33 files changed, 247 insertions(+), 258 deletions(-)
check +22 -33
index 17bc004..18cae75 100755
@@ -36,25 +36,38 @@ here=`pwd`
 FSTYP=xfs
 xfile=""
 
-SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-SRC_GROUPS="generic shared"
-export SRC_DIR="tests"
-export RESULT_BASE=${RESULT_BASE:="results"}
-
-# generic initialization
+# start the initialisation work now
 iam=check
 
+export MSGVERB="text:action"
 export QA_CHECK_FS=${QA_CHECK_FS:=true}
 
-# by default don't output timestamps
-timestamp=${TIMESTAMP:=false}
-
 # number of diff lines from a failed test, 0 for whole output
 export DIFF_LENGTH=${DIFF_LENGTH:=10}
 
 # by default don't output timestamps
 timestamp=${TIMESTAMP:=false}
 
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
+
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]; then
+    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+fi
+export FSTYP
+
+# we need common.config
+if ! . ./common/config
+then
+    echo "$iam: failed to source common/config"
+    exit 1
+fi
+
+SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
+SRC_GROUPS="generic shared"
+export SRC_DIR="tests"
+export RESULT_BASE=${RESULT_BASE:="$here/results"}
+
 usage()
 {
     echo "Usage: $0 [options] [testlist]"'
@@ -79,12 +92,6 @@ testlist options
 	    exit 0
 }
 
-_setenvironment()
-{
-    MSGVERB="text:action"
-    export MSGVERB
-}
-
 get_group_list()
 {
 	grp=$1
@@ -147,24 +154,6 @@ _timestamp()
     echo -n " [$now]"
 }
 
-# start the initialisation work now
-_setenvironment
-
-rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
-
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
-    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-fi
-export FSTYP
-
-# we need common.config
-if ! . ./common/config
-then
-    echo "$iam: failed to source common/config"
-    exit 1
-fi
-
 # Process command arguments first.
 while [ $# -gt 0 ]; do
 	case "$1" in
common/attr +2 -2
index 69bcb01..e5070bf 100644
@@ -129,7 +129,7 @@ _require_acls()
     #
     touch $TEST_DIR/syscalltest
     chacl -l $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
-    cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
+    cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
       _notrun "kernel does not support ACLs"
@@ -164,7 +164,7 @@ _require_attrs()
     #
     touch $TEST_DIR/syscalltest
     attr -s "user.xfstests" -V "attr" $TEST_DIR > $TEST_DIR/syscalltest.out 2>&1
-    cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
+    cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
       _notrun "kernel does not support attrs"
common/defrag +2 -2
index 13405a4..f04fd42 100644
@@ -44,7 +44,7 @@ _require_defrag()
 _extent_count()
 {
 	$FILEFRAG_PROG $1 | awk '{print $2}'
-	$FILEFRAG_PROG -v $1  >> $RESULT_DIR/$seq.full 2>&1
+	$FILEFRAG_PROG -v $1  >> $seqres.full 2>&1
 }
 
 # Defrag file, check it, and remove it.
@@ -54,7 +54,7 @@ _defrag()
 	_extent_count $1
 	CSUM_BEFORE=`md5sum $1`
 	STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
-	$DEFRAG_PROG -v $1 >> $RESULT_DIR/$seq.full 2>&1
+	$DEFRAG_PROG -v $1 >> $seqres.full 2>&1
 	_scratch_remount
 	STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1`
 	CSUM_AFTER=`md5sum $1`
common/dump +43 -43

269 lines not on this page · raw message

common/filestreams +2 -2
index b3aee27..590fa7f 100644
@@ -116,7 +116,7 @@ _check_for_dupes()
                 for this_num_two in $num_str_two; do
                         if [ "$this_num_one" == "$this_num_two" ]; then
 				echo "duplicate AG $this_num_one found" \
-					>> $RESULT_DIR/$seq.full
+					>> $seqres.full
 				return 1
 			fi
                 done
@@ -189,7 +189,7 @@ _test_streams() {
 	stream_index=1
 	while [ $stream_index -le $stream_count ]; do
 		this_stream_ags=`_get_stream_ags stream${stream_index}-dir`
-		echo "stream $stream_index AGs: $this_stream_ags" >> $RESULT_DIR/$seq.full
+		echo "stream $stream_index AGs: $this_stream_ags" >> $seqres.full
 		_check_for_dupes "$ags_seen" "$this_stream_ags"
 		if [ $? -ne 0 ]; then
 			# this stream is not in seperate AGs to previous streams
common/log +18 -18
index e0e2bc6..88e64bc 100644
@@ -20,7 +20,7 @@
 # Created by [email protected] & [email protected]
 #
 
-fulldir=$RESULT_DIR/$seq.fulldir
+fulldir=$seqres.fulldir
 rm -rf $fulldir
 
 _cleanup_logfiles()
@@ -33,16 +33,16 @@ _cleanup_logfiles()
 
 _full()
 {
-    echo ""            >>$RESULT_DIR/$seq.full      
-    echo "*** $* ***"  >>$RESULT_DIR/$seq.full
-    echo ""            >>$RESULT_DIR/$seq.full
+    echo ""            >>$seqres.full      
+    echo "*** $* ***"  >>$seqres.full
+    echo ""            >>$seqres.full
 }
 
 _echofull()
 {
-    echo ""            | tee -a $RESULT_DIR/$seq.full      
-    echo "*** $* ***"  | tee -a $RESULT_DIR/$seq.full
-    echo ""            | tee -a $RESULT_DIR/$seq.full
+    echo ""            | tee -a $seqres.full      
+    echo "*** $* ***"  | tee -a $seqres.full
+    echo ""            | tee -a $seqres.full
 }
 
 # Handle the operations which get split over Log Record
@@ -212,13 +212,13 @@ _filter_logprint()
 _check_log()
 {
     _full "clean_log : xfs_logprint"
-    _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+    _scratch_xfs_logprint -t | tee -a $seqres.full \
         | head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
 }
 
 _print_logstate()
 {
-    _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full >$tmp.logprint
+    _scratch_xfs_logprint -t | tee -a $seqres.full >$tmp.logprint
     if grep -q "<DIRTY>" $tmp.logprint; then
 	echo "dirty log"
     fi
@@ -288,7 +288,7 @@ _mkfs_log()
     # mkfs options to append to log size otion can be specified ($*)
     export MKFS_OPTIONS="-l size=2000b -l lazy-count=1 $*"
     _full "mkfs"
-    _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mkfs_xfs >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS"
 	return 1
@@ -305,7 +305,7 @@ _create_log()
 {
     # mount the FS
     _full "mount"
-    _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mount >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "mount failed: $MOUNT_OPTIONS"
 	return 1
@@ -318,7 +318,7 @@ _create_log()
 	
     # unmount the FS
     _full "umount"
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "umount failed"
 	return 1
@@ -334,7 +334,7 @@ _create_log_sync()
 {
     # mount the FS
     _full " mount"
-    _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mount >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "mount failed: $MOUNT_OPTIONS"
 	return 1
@@ -349,7 +349,7 @@ _create_log_sync()
 
     # unmount the FS
     _full "umount"
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "umount failed"
 	return 1
@@ -448,21 +448,21 @@ _require_v2log()
 {
     # test out mkfs to see if it supports "-l version=2"
     export MKFS_OPTIONS="-l version=2"
-    if ! _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1; then
+    if ! _scratch_mkfs_xfs >>$seqres.full 2>&1; then
         _notrun "mkfs does not support v2 logs"
     fi
 
     # test out mount to see if it mounts a v2 log fs
     export MOUNT_OPTIONS="-o logbsize=32k"
-    if ! _scratch_mount >>$RESULT_DIR/$seq.full 2>&1; then
+    if ! _scratch_mount >>$seqres.full 2>&1; then
         _notrun "mount/kernel does not support v2 logs"
     fi
 
     # check after unmount to see if it is clean
     # i.e. it is not a 6.5.25 buggy version checking kernel
     touch $SCRATCH_MNT/file
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
-    if _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
+    if _scratch_xfs_logprint -t | tee -a $seqres.full \
         | head | grep -q "<DIRTY>"; then
         _notrun "kernel does not support v2 logs"
     fi
common/quota +9 -9
index ff80382..7f349ab 100644
@@ -96,8 +96,8 @@ _file_as_id()
 
     parent=`dirname $1`
     if [ $3 = p ]; then
-	echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full
-	$XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full 2>&1
+	echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full
+	$XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full 2>&1
 	magik='$>'	# (irrelevent, above set projid-inherit-on-parent)
     elif [ $3 = u ]; then
 	magik='$>'	# perlspeak for effective uid
@@ -107,7 +107,7 @@ _file_as_id()
 	_notrun "broken type in call to _file_as_id in test $seq"
     fi
 
-    perl <<EOF >>$RESULT_DIR/$seq.full 2>&1
+    perl <<EOF >>$seqres.full 2>&1
 	\$| = 1;
 	$magik = $2;
 	if ($5 == 0) {
@@ -119,11 +119,11 @@ _file_as_id()
 	}
 EOF
 # for debugging the above euid change, try... [need write in cwd]
-#	exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$RESULT_DIR/$seq.full 2>&1";
+#	exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$seqres.full 2>&1";
 
     if [ $3 = p ]; then
-	echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full
-	$XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full 2>&1
+	echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full
+	$XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full 2>&1
     fi
 }
 
@@ -198,8 +198,8 @@ _qsetup()
 	_notrun "No quota support at mount time"
     fi
 
-    echo "Using output from '" `ls -l $seq.out` "'" >>$RESULT_DIR/$seq.full
-    echo "and using type=$type id=$id" >>$RESULT_DIR/$seq.full
+    echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
+    echo "and using type=$type id=$id" >>$seqres.full
 }
 
 #
@@ -229,7 +229,7 @@ _qmount_option()
 
 	# Ensure we have the given quota option - duplicates are fine
 	export MOUNT_OPTIONS="$MOUNT_OPTIONS -o $1"
-	echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$RESULT_DIR/$seq.full
+	echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seqres.full
 }
 
 _check_quota_usage()
common/rc +49 -49

210 lines not on this page · raw message

common/scsi_debug +1 -1
index f05c8db..d073b6d 100644
@@ -47,7 +47,7 @@ _get_scsi_debug_dev()
 		let phys_exp=phys_exp+1
 	done
 	opts="sector_size=$logical physblk_exp=$phys_exp lowest_aligned=$unaligned dev_size_mb=$size"
-	echo "scsi_debug options $opts" >> $RESULT_DIR/$seq.full
+	echo "scsi_debug options $opts" >> $seqres.full
 	modprobe scsi_debug $opts
 	[ $? -eq 0 ] || _fail "scsi_debug modprobe failed"
 	sleep 1
tests/generic/001 +4 -4
index 35c88f2..aa82441 100755
@@ -190,7 +190,7 @@ _mark_iteration()
 #
 _chain()
 {
-    $AWK_PROG -v full_file=$here/$seqres.full -v verify=$verify <$tmp.config '
+    $AWK_PROG -v full_file=$seqres.full -v verify=$verify <$tmp.config '
 BEGIN	{ nfile = 0 }
 /^\#/	{ next }
 	{ file[nfile] = $1
@@ -238,7 +238,7 @@ END	{ srand('$iter')
 	    }
 	  }
 	}' \
-	| tee -a $here/$seqres.full | sh
+	| tee -a $seqres.full | sh
 }
 
 _check()
@@ -292,7 +292,7 @@ _cleanup()
     fi
 }
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 status=0
 _cleanup
 status=1
@@ -306,7 +306,7 @@ _setup
 for iter in 1 2 3 4 5
 do
     echo -n "iter $iter chain ... "
-    echo "iter $iter" >> $here/$seqres.full
+    echo "iter $iter" >> $seqres.full
     _chain
     _check
     if [ -f $tmp.bad ]
tests/generic/010 +1 -1
index d338db6..0bdfdd5 100755
@@ -64,7 +64,7 @@ rm -f $seqres.full
 
 cd $testdir
 
-$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seqres.full | _filter_dbtest
+$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $seqres.full | _filter_dbtest
 
 # success, all done
 exit
tests/generic/013 +6 -6
index a9c07c4..b364f1b 100755
@@ -78,11 +78,11 @@ _do_test()
     if ! $FSSTRESS_PROG $_param $FSSTRESS_AVOID -v -m 8 -n $_count -d $out >>$dbgoutfile 2>&1
     then
         echo "    fsstress (count=$_count) returned $? - see $seqres.full"
-        echo "--------------------------------------"       >>$here/$seqres.full
-        echo "$_n - output from fsstress:"                  >>$here/$seqres.full
-        echo "--------------------------------------"       >>$here/$seqres.full
-        echo "<NOT LOGGED>"                                 >>$here/$seqres.full
-        #cat $tmp.out                                       >>$here/$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from fsstress:"                  >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "<NOT LOGGED>"                                 >>$seqres.full
+        #cat $tmp.out                                       >>$seqres.full
         status=1
     fi
 
@@ -96,7 +96,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 count=1000
tests/generic/074 +1 -1
index 6df8c57..b9e1595 100755
@@ -108,7 +108,7 @@ _process_args()
 
 
 # real QA test starts here
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 _supported_fs generic
 _supported_os IRIX Linux
tests/generic/075 +5 -5
index 52e6a43..4477db4 100755
@@ -78,10 +78,10 @@ _do_test()
     cd $out
     if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
-	echo "    fsx ($_param) failed, $? - compare $seq.$_n.{good,bad,fsxlog}"
-	mv $out/$seq.$_n $here/$seq.$_n.full
-	od -xAx $here/$seq.$_n.full > $here/$seq.$_n.bad
-	od -xAx $here/$seq.$_n.fsxgood > $here/$seq.$_n.good
+	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
+	mv $out/$seq.$_n $seqres.$_n.full
+	od -xAx $seqres.$_n.full > $seqres.$_n.bad
+	od -xAx $seqres.$_n.fsxgood > $seqres.$_n.good
 	status=1
 	exit
     fi
@@ -139,7 +139,7 @@ echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 _check_test_fs
tests/generic/089 +2 -2
index c4c76e2..fdddad4 100755
@@ -73,8 +73,8 @@ mtab()
 
 	echo directory entries:
 	ls | grep mtab
-	echo directory entries >> $here/$seqres.full
-	ls -li >> $here/$seqres.full
+	echo directory entries >> $seqres.full
+	ls -li >> $seqres.full
 }
 
 # directory with only a few entries
tests/generic/100 +4 -4
index 123dc5f..f4b0c8f 100755
@@ -62,10 +62,10 @@ rm -rf $POPULATED_DIR
 rm -f $TEMP_DIR/$TAR_FILE
 
 # Create the new directory structure
-_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seqres.full 2>&1
+_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$seqres.full 2>&1
 
 # Then tar up the directory structure
-tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seqres.full 2>&1
+tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$seqres.full 2>&1
 
 # create f/s
 _require_scratch
@@ -73,12 +73,12 @@ _setup_testdir
 
 # untar on f/s
 cd $testdir
-tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seqres.full 2>&1
+tar -xRvf $TEMP_DIR/$TAR_FILE >>$seqres.full 2>&1
 cd $here
 
 
 # use diff -qr to compare
-ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seqres.full 2>&1
+ls -R -l ${testdir}${POPULATED_DIR} >>$seqres.full 2>&1
 diff -qr $POPULATED_DIR ${testdir}${POPULATED_DIR}
 
 cd /
tests/generic/112 +2 -2
index 5f5b19d..0cd19db 100755
@@ -79,7 +79,7 @@ _do_test()
     if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
 	echo "    fsx ($_param) returned $? - see $seq.$_n.full"
-	mv $seq.$_n.fsxlog $here/$seq.$_n.full
+	mv $seq.$_n.fsxlog $seqres.$_n.full
 	status=1
 	exit
     fi
@@ -140,7 +140,7 @@ echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 _check_test_fs
tests/generic/192 +1 -1
index 66d8a66..13784f7 100755
@@ -67,7 +67,7 @@ time2=`_access_time $testfile | tee -a $seqres.full`
 cd /
 umount $TEST_DIR
 _test_mount
-time3=`_access_time $testfile | tee -a $here/$seqres.full`
+time3=`_access_time $testfile | tee -a $seqres.full`
 
 delta1=`expr $time2 - $time1`
 delta2=`expr $time3 - $time1`
tests/generic/232 +4 -4
index ee0e16e..2402c45 100755
@@ -39,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -55,11 +55,11 @@ _fsstress()
 	count=2000
 	args=`_scale_fsstress_args -d $out -n $count -p 7`
 
-	echo "fsstress $args" >> tee -a $here/$seqres.full
-	if ! $FSSTRESS_PROG $args | tee -a $here/$seqres.full | _filter_num
+	echo "fsstress $args" >> tee -a $seqres.full
+	if ! $FSSTRESS_PROG $args | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 }
tests/generic/233 +4 -4
index 1eb68c5..2b6cd2f 100755
@@ -43,7 +43,7 @@ FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -62,11 +62,11 @@ _fsstress()
 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
 -n $count -d $out -p 7`
 
-	echo "fsstress $args" >> tee -a $here/$seqres.full
-	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seqres.full | _filter_num
+	echo "fsstress $args" >> tee -a $seqres.full
+	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 }
tests/generic/269 +2 -2
index 6e33368..684cf42 100755
@@ -45,7 +45,7 @@ _workout()
 	enospc_time=2
 	out=$SCRATCH_MNT/fsstress.$$
 	args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out`
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	$FSSTRESS_PROG $args > /dev/null 2>&1 &
 	pid=$!
 	echo "Run dd writers in parallel"
@@ -53,7 +53,7 @@ _workout()
 	do
 		# File will be opened with O_TRUNC each time
 		dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M \
-			>> $here/$seqres.full 2>&1
+			>> $seqres.full 2>&1
 		sleep $enospc_time
 	done
 	kill $pid
tests/generic/270 +2 -2
index 294bb62..b5ed7af 100755
@@ -48,7 +48,7 @@ _workout()
 	enospc_time=2
 	out=$SCRATCH_MNT/fsstress.$$
 	args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out`
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	# Grant chown capability 
 	cp $FSSTRESS_PROG  $tmp.fsstress.bin
 	if [ "`whereis setcap`" == "setcap:" ]; then
@@ -65,7 +65,7 @@ _workout()
 		# File will be opened with O_TRUNC each time
 		su $qa_user -c "dd if=/dev/zero \
 			of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M " \
-			>> $here/$seqres.full 2>&1
+			>> $seqres.full 2>&1
 		sleep $enospc_time
 	done
 
tests/shared/305 +6 -6
index bcb235f..91cbf03 100644
@@ -62,7 +62,7 @@ disallow_fail_make_request()
 start_fail_scratch_dev()
 {
     echo "Force SCRATCH_DEV device failure"
-    echo " echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $here/$seqres.full
+    echo " echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $seqres.full
     echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail
 
 }
@@ -70,7 +70,7 @@ start_fail_scratch_dev()
 stop_fail_scratch_dev()
 {
     echo "Make SCRATCH_DEV device operable again"
-    echo " echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $here/$seqres.full
+    echo " echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $seqres.full
     echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail
 
 }
@@ -139,12 +139,12 @@ _workout()
 	echo ""
 	echo "Start fsstress.."
 	echo ""
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	$FSSTRESS_PROG $args > /dev/null 2>&1 &
 	fs_pid=$!
 	echo "Start fio.."
 	cat $tmp-$seq.fio >>  $seqres.full
-	$FIO_PROG $tmp-$seq.fio >> $here/$seqres.full 2>&1 &
+	$FIO_PROG $tmp-$seq.fio >> $seqres.full 2>&1 &
 	fio_pid=$!
 
 	# Let's it work for awhile, and force device failure
@@ -154,7 +154,7 @@ _workout()
 	# that so buffered write(2) may succeed, but any integrity operations
 	# such as (sync, fsync, fdatasync, direct-io) should fail.
 	dd if=/dev/zero of=$SCRATCH_MNT/touch_failed_filesystem count=1 bs=4k conv=fsync \
-	    >> $here/$seqres.full 2>&1 && \
+	    >> $seqres.full 2>&1 && \
 	    _fail "failed: still able to perform integrity fsync on $SCRATCH_MNT"
 
 	kill $fs_pid
@@ -176,7 +176,7 @@ _workout()
 
 # real QA test starts here
 
-_scratch_mkfs >> $here/$seqres.full 2>&1 || _fail "mkfs failed"
+_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
 _scratch_mount || _fail "mount failed"
 allow_fail_make_request
 _workout
tests/xfs/008 +9 -9
index 4bf6c00..e7a1768 100755
@@ -73,14 +73,14 @@ _do_test()
 	fi
     else
         echo "    randholes returned $? - see $seq.out.full"
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from randholes:"                 >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        cat $tmp.out                                        >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from bmap:"                      >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        xfs_bmap -vvv $out                                  >>$here/$seq.out.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from randholes:"                 >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        cat $tmp.out                                        >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from bmap:"                      >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        xfs_bmap -vvv $out                                  >>$seqres.full
         status=1
     fi
 }
@@ -91,7 +91,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seq.out.full
+rm -f $seqres.full
 
 # Note on special numbers here.
 #
tests/xfs/012 +15 -15
index 87c0b85..cd9c485 100755
@@ -62,7 +62,7 @@ _do_test()
     echo "-----------------------------------------------"
     if  ! $here/src/holes $_param $out >$tmp.out
     then
-        echo "    holes returned $? - see $seq.out.full"
+        echo "    holes returned $? - see $seqres.full"
         failed=1
         status=1
     fi
@@ -78,7 +78,7 @@ _do_test()
         
         if [ $count -ne $_count ]
         then
-            echo "    unexpected number of holes - see $seq.out.full"
+            echo "    unexpected number of holes - see $seqres.full"
             status=1
             failed=1
         fi
@@ -86,18 +86,18 @@ _do_test()
         
     if [ $failed -eq 1 ]
     then
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from holes:"                     >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        cat $tmp.out                                        >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from bmap:"                      >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        xfs_bmap -vvv $out                                  >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from ls -li:"                    >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        ls -li $out                                         >>$here/$seq.out.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from holes:"                     >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        cat $tmp.out                                        >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from bmap:"                      >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        xfs_bmap -vvv $out                                  >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from ls -li:"                    >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        ls -li $out                                         >>$seqres.full
         status=1
     fi
 }
@@ -108,7 +108,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seq.out.full
+rm -f $seqres.full
 
 # small & fairly dense
 _do_test 1 "-l 40960000 -b 40960 -i 10 -c 1" 100
tests/xfs/024 +2 -2
index 68e9788..2e13288 100755
@@ -43,11 +43,11 @@ _require_tape $TAPE_DEV
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 _erase_hard
 _do_dump
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 _erase_hard
 _do_dump -l 1
 _do_restore
tests/xfs/067 +3 -3
index fbfaa1f..27f5713 100755
@@ -50,11 +50,11 @@ isize=0
 _scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs
 [ $? -eq 0 ] && source $tmp.mkfs
 if [ "$isize" -lt 1024 ]; then
-    _scratch_mkfs_xfs -i size=1024 >>$here/$seqres.full \
+    _scratch_mkfs_xfs -i size=1024 >>$seqres.full \
 	|| _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
 fi
-_scratch_mount >>$here/$seqres.full || _fail "mount failed"
-xfs_info $SCRATCH_MNT >>$here/$seqres.full
+_scratch_mount >>$seqres.full || _fail "mount failed"
+xfs_info $SCRATCH_MNT >>$seqres.full
 cd $SCRATCH_MNT
 
 echo ""
tests/xfs/114 +15 -15
index 4dfdf86..1029dbc 100755
@@ -80,8 +80,8 @@ _test_create()
 	p=dir2/dir3/dir4/file4
 	touch $p
 
-	#_print_names $p >>$here/$seqres.full
-	_print_names $p | tee -a $here/$seqres.full
+	#_print_names $p >>$seqres.full
+	_print_names $p | tee -a $seqres.full
 
 	_check_paths $SCRATCH_MNT/$p
 }
@@ -131,13 +131,13 @@ _test_hardlink()
 		ln $p $x
 	done
 
-	_print_names $p >>$here/$seqres.full
+	_print_names $p >>$seqres.full
 
 	echo ""
 	echo "print out names and check after created hardlinks"
 	echo ""
 	for x in $paths; do
-		_print_names $x | tee -a $here/$seqres.full
+		_print_names $x | tee -a $seqres.full
 		_check_paths $SCRATCH_MNT/$x
 	done
 
@@ -161,7 +161,7 @@ _test_hardlink()
 	echo ""
 	for x in $paths; do
 		if [ -e $x ]; then 
-			_print_names $x | tee -a $here/$seqres.full
+			_print_names $x | tee -a $seqres.full
 			_check_paths $SCRATCH_MNT/$x
 		fi
 	done
@@ -230,7 +230,7 @@ _test_rename()
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -255,7 +255,7 @@ _test_fsstress()
 	if ! $FSSTRESS_PROG $args | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 
@@ -284,8 +284,8 @@ _test_dirstress()
 	if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
 	then
 		echo "    dirstress failed"
-		echo "*** dirstress $args" | tee -a $here/$seqres.full
-		cat $tmp.out >>$here/$seqres.full
+		echo "*** dirstress $args" | tee -a $seqres.full
+		cat $tmp.out >>$seqres.full
 		status=1
 		exit
 	fi
@@ -295,8 +295,8 @@ _test_dirstress()
 	if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
 	then
 		echo "    dirstress failed"
-		echo "*** dirstress $args" | tee -a $here/$seqres.full
-		cat $tmp.out >>$here/$seqres.full
+		echo "*** dirstress $args" | tee -a $seqres.full
+		cat $tmp.out >>$seqres.full
 		status=1
 		exit
 	fi
@@ -316,16 +316,16 @@ _require_scratch
 _require_attrs
 _need_to_be_root
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
     || _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs -i parent=1 >>$seqres.full 2>&1 \
     || _notrun "parent inodes not supported"
 
 echo "mount"
-_scratch_mount >>$here/$seqres.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
     || _fail "mount failed: $MOUNT_OPTIONS"
 
 # real QA test starts here
tests/xfs/115 +4 -4
index 0933c54..967a904 100755
@@ -102,16 +102,16 @@ _supported_os IRIX
 _require_scratch
 _require_attrs
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
     || _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i paths=1 >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs -i paths=1 >>$seqres.full 2>&1 \
     || _notrun "i_paths not supported"
 
 echo "mount"
-_scratch_mount >>$here/$seqres.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
     || _fail "mount failed: $MOUNT_OPTIONS"
 
 # real QA test starts here
tests/xfs/168 +1 -1
index 4ca2869..901125a 100755
@@ -107,7 +107,7 @@ wait
 # dmapi destroy events are asyncronous,  don't rely on fixed ordering of events
 # in print_event output, use sort.
 echo "# here comes the dmapi print_event filtered and sorted output"
-cat $tmp.print_event_out | tee -a $here/$seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
+cat $tmp.print_event_out | tee -a $seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
 rm $tmp.print_event_out
 
 status=0
tests/xfs/186 +2 -2
index 44edaf7..8df91b6 100755
@@ -78,7 +78,7 @@ _rmv_eas()
 
 _filter_inode()
 {
-	tee -a $here/$seqres.full | \
+	tee -a $seqres.full | \
 		sed -e "s/core.forkoff/forkoff/g" | \
 		egrep '^u.sfdir2|^a.sfattr|forkoff' | \
 		egrep -v 'inumber|parent'
@@ -86,7 +86,7 @@ _filter_inode()
 
 _filter_version()
 {
-	tee -a $here/$seqres.full | tr ',' '\n' | grep ATTR
+	tee -a $seqres.full | tr ',' '\n' | grep ATTR
 }
 
 _print_inode()
tests/xfs/282 +2 -2
index 8ddb258..15ccc3f 100755
@@ -46,13 +46,13 @@ _require_legacy_v2_format
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 0 dump, format 2"
 _do_dump_file -f $tmp.l0 -K
 
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 1 dump, current format"
 _do_dump_file -l 1 -f $tmp.l1
tests/xfs/283 +2 -2
index cd9609e..def2107 100755
@@ -46,13 +46,13 @@ _require_legacy_v2_format
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 0 dump, current format"
 _do_dump_file -f $tmp.l0
 
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 1 dump, format 2"
 _do_dump_file -l 1 -f $tmp.l1 -K
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 22/25
#50 lore raw

Re: [PATCH 22/25] xfstests: RESULTS_DIR needs to be an absolute path

Looks OK.

Quoted 1,637 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Some tests 'cd <somedir>' and then direct output to $RESULT_DIR, which fails if the current working directory is not $here. Regardless, if an external results directory is to be used it needs to have a full path specified and the use of $here as the base of the results files is completely incorrect.

Hence change all the $here/$seqres* references to simply be $seqres*, and instead encode the full path to the results in $RESULT_DIR.

---
 check              |   55 ++++++++++++-----------------
 common/attr        |    4 +--
 common/defrag      |    4 +--
 common/dump        |   86 ++++++++++++++++++++++-----------------------
 common/filestreams |    4 +--
 common/log         |   36 +++++++++----------
 common/quota       |   18 +++++-----
 common/rc          |   98 ++++++++++++++++++++++++++--------------------------
 common/scsi_debug  |    2 +-
 tests/generic/001  |    8 ++---
 tests/generic/010  |    2 +-
 tests/generic/013  |   12 +++----
 tests/generic/074  |    2 +-
 tests/generic/075  |   10 +++---
 tests/generic/089  |    4 +--
 tests/generic/100  |    8 ++---
 tests/generic/112  |    4 +--
 tests/generic/192  |    2 +-
 tests/generic/232  |    8 ++---
 tests/generic/233  |    8 ++---
 tests/generic/269  |    4 +--
 tests/generic/270  |    4 +--
 tests/shared/305   |   12 +++----
 tests/xfs/008      |   18 +++++-----
 tests/xfs/012      |   30 ++++++++--------
 tests/xfs/024      |    4 +--
 tests/xfs/067      |    6 ++--
 tests/xfs/114      |   30 ++++++++--------
 tests/xfs/115      |    8 ++---
 tests/xfs/168      |    2 +-
 tests/xfs/186      |    4 +--
 tests/xfs/282      |    4 +--
 tests/xfs/283      |    4 +--
 33 files changed, 247 insertions(+), 258 deletions(-)
check +22 -33
index 17bc004..18cae75 100755
@@ -36,25 +36,38 @@ here=`pwd`
 FSTYP=xfs
 xfile=""
 
-SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-SRC_GROUPS="generic shared"
-export SRC_DIR="tests"
-export RESULT_BASE=${RESULT_BASE:="results"}
-
-# generic initialization
+# start the initialisation work now
 iam=check
 
+export MSGVERB="text:action"
 export QA_CHECK_FS=${QA_CHECK_FS:=true}
 
-# by default don't output timestamps
-timestamp=${TIMESTAMP:=false}
-
 # number of diff lines from a failed test, 0 for whole output
 export DIFF_LENGTH=${DIFF_LENGTH:=10}
 
 # by default don't output timestamps
 timestamp=${TIMESTAMP:=false}
 
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
+
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]; then
+    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+fi
+export FSTYP
+
+# we need common.config
+if ! . ./common/config
+then
+    echo "$iam: failed to source common/config"
+    exit 1
+fi
+
+SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
+SRC_GROUPS="generic shared"
+export SRC_DIR="tests"
+export RESULT_BASE=${RESULT_BASE:="$here/results"}
+
 usage()
 {
     echo "Usage: $0 [options] [testlist]"'
@@ -79,12 +92,6 @@ testlist options
 	    exit 0
 }
 
-_setenvironment()
-{
-    MSGVERB="text:action"
-    export MSGVERB
-}
-
 get_group_list()
 {
 	grp=$1
@@ -147,24 +154,6 @@ _timestamp()
     echo -n " [$now]"
 }
 
-# start the initialisation work now
-_setenvironment
-
-rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
-
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
-    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-fi
-export FSTYP
-
-# we need common.config
-if ! . ./common/config
-then
-    echo "$iam: failed to source common/config"
-    exit 1
-fi
-
 # Process command arguments first.
 while [ $# -gt 0 ]; do
 	case "$1" in
common/attr +2 -2
index 69bcb01..e5070bf 100644
@@ -129,7 +129,7 @@ _require_acls()
     #
     touch $TEST_DIR/syscalltest
     chacl -l $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
-    cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
+    cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
       _notrun "kernel does not support ACLs"
@@ -164,7 +164,7 @@ _require_attrs()
     #
     touch $TEST_DIR/syscalltest
     attr -s "user.xfstests" -V "attr" $TEST_DIR > $TEST_DIR/syscalltest.out 2>&1
-    cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
+    cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
       _notrun "kernel does not support attrs"
common/defrag +2 -2
index 13405a4..f04fd42 100644
@@ -44,7 +44,7 @@ _require_defrag()
 _extent_count()
 {
 	$FILEFRAG_PROG $1 | awk '{print $2}'
-	$FILEFRAG_PROG -v $1  >> $RESULT_DIR/$seq.full 2>&1
+	$FILEFRAG_PROG -v $1  >> $seqres.full 2>&1
 }
 
 # Defrag file, check it, and remove it.
@@ -54,7 +54,7 @@ _defrag()
 	_extent_count $1
 	CSUM_BEFORE=`md5sum $1`
 	STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
-	$DEFRAG_PROG -v $1 >> $RESULT_DIR/$seq.full 2>&1
+	$DEFRAG_PROG -v $1 >> $seqres.full 2>&1
 	_scratch_remount
 	STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1`
 	CSUM_AFTER=`md5sum $1`
common/dump +43 -43
index 0395ee3..3df6191 100644
@@ -20,7 +20,7 @@
 #
 
 # --- initializations ---
-rm -f $RESULT_DIR/$seq.full
+rm -f $seqres.full
 
 if [ -n "$DEBUGDUMP" ]; then
 	_dump_debug=-v4
@@ -125,7 +125,7 @@ _check_onl()
     _limit=10
     i=0
     while [ $i -lt $_limit ]; do
-        echo "Checking online..." >>$RESULT_DIR/$seq.full
+        echo "Checking online..." >>$seqres.full
 	if _mt status >$tmp.status 2>&1; then
 	    break;
 	else
@@ -159,12 +159,12 @@ _check_onl()
 
 _wait_tape()
 {
-    echo "Wait for tape, $dumptape, ..." >>$RESULT_DIR/$seq.full
+    echo "Wait for tape, $dumptape, ..." >>$seqres.full
 
     i=0
     while [ $i -lt 20 ]; do
-        echo "Checking status..." >>$RESULT_DIR/$seq.full
-	if _mt status 2>&1 | tee -a $RESULT_DIR/$seq.full | egrep -i "onl|ready" >/dev/null; then
+        echo "Checking status..." >>$seqres.full
+	if _mt status 2>&1 | tee -a $seqres.full | egrep -i "onl|ready" >/dev/null; then
 	    break;
 	else
 	    sleep 1
@@ -178,7 +178,7 @@ _wait_tape()
 #
 _rewind()
 {
-    echo "Initiate rewind..." >>$RESULT_DIR/$seq.full
+    echo "Initiate rewind..." >>$seqres.full
     _wait_tape
     _mt rewind >/dev/null
     _wait_tape
@@ -191,7 +191,7 @@ _rewind()
 #
 _erase_soft()
 {
-    echo "Erasing tape" | tee -a $RESULT_DIR/$seq.full
+    echo "Erasing tape" | tee -a $seqres.full
     _rewind
     _mt weof 3
     _rewind
@@ -199,7 +199,7 @@ _erase_soft()
 
 _erase_hard()
 {
-    echo "Erasing tape" | tee -a $RESULT_DIR/$seq.full
+    echo "Erasing tape" | tee -a $seqres.full
     _mt erase
 }
 
@@ -230,7 +230,7 @@ _require_tape()
 
     if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
         echo "This test requires a dump tape - none was specified"
-	echo "No dump tape specified" >$RESULT_DIR/$seq.notrun
+	echo "No dump tape specified" >$seqres.notrun
 	status=$NOTRUNSTS
 	exit
     fi
@@ -243,8 +243,8 @@ _wipe_fs()
 {
     _require_scratch
 
-    _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full || _fail "mkfs failed"
-    _scratch_mount >>$RESULT_DIR/$seq.full || _fail "mount failed"
+    _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
+    _scratch_mount >>$seqres.full || _fail "mount failed"
 }
 
 #
@@ -266,8 +266,8 @@ _cleanup()
 	# save it for inspection
 	for dir in /var/xfsdump/inventory /var/lib/xfsdump/inventory; do
 	    [ -d $dir ] || continue
-	    tar -cvf $RESULT_DIR/$seq.inventory.tar $dir
-	    ls -nR $dir >$RESULT_DIR/$seq.inventory.ls
+	    tar -cvf $seqres.inventory.tar $dir
+	    ls -nR $dir >$seqres.inventory.ls
 	done
     fi
 
@@ -295,8 +295,8 @@ _cleanup()
 _stable_fs()
 {
     _saveddir=`pwd`; cd /
-    umount $SCRATCH_MNT >>$RESULT_DIR/$seq.full || _fail "unmount failed"
-    _scratch_mount >>$RESULT_DIR/$seq.full || _fail "mount failed"
+    umount $SCRATCH_MNT >>$seqres.full || _fail "unmount failed"
+    _scratch_mount >>$seqres.full || _fail "mount failed"
     cd $_saveddir
 }
 
@@ -326,12 +326,12 @@ _create_dumpdir_stress()
     echo "-----------------------------------------------"
     if ! $here/ltp/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
     then
-        echo "    fsstress (count=$_count) returned $? - see $RESULT_DIR/$seq.full"
+        echo "    fsstress (count=$_count) returned $? - see $seqres.full"
 
-        echo "--------------------------------------"       >>$RESULT_DIR/$seq.full
-        echo "output from fsstress:"                        >>$RESULT_DIR/$seq.full
-        echo "--------------------------------------"       >>$RESULT_DIR/$seq.full
-        cat $tmp.out                                        >>$RESULT_DIR/$seq.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "output from fsstress:"                        >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        cat $tmp.out                                        >>$seqres.full
         status=1
     fi
 
@@ -1043,7 +1043,7 @@ _do_dump_sub()
     echo "Dumping to tape..."
     opts="$_dump_debug$dump_args -s $dump_sdir -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
     echo "xfsdump $opts" | _dir_filter
-    $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1056,7 +1056,7 @@ _do_dump()
     echo "Dumping to tape..."
     opts="$_dump_debug$dump_args -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
     echo "xfsdump $opts" | _dir_filter
-    $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 
@@ -1071,7 +1071,7 @@ _do_dump_min()
     onemeg=1048576
     opts="$_dump_debug$dump_args -m -b $onemeg -l0 -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
     echo "xfsdump $opts" | _dir_filter
-    $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 
@@ -1085,7 +1085,7 @@ _do_dump_file()
     echo "Dumping to file..."
     opts="$_dump_debug$dump_args -f $dump_file -M $media_label -L $session_label $SCRATCH_MNT"
     echo "xfsdump $opts" | _dir_filter
-    $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1107,7 +1107,7 @@ _do_dump_multi_file()
     echo "Dumping to files..."
     opts="$_dump_debug$dump_args $multi_args -L $session_label $SCRATCH_MNT"
     echo "xfsdump $opts" | _dir_filter
-    $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 
@@ -1140,7 +1140,7 @@ _do_restore()
     echo "Restoring from tape..."
     opts="$_restore_debug$restore_args -f $dumptape  -L $session_label $restore_dir"
     echo "xfsrestore $opts" | _dir_filter
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1155,7 +1155,7 @@ _do_restore_min()
     onemeg=1048576
     opts="$_restore_debug$restore_args -m -b $onemeg -f $dumptape  -L $session_label $restore_dir"
     echo "xfsrestore $opts" | _dir_filter
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1169,7 +1169,7 @@ _do_restore_file()
     echo "Restoring from file..."
     opts="$_restore_debug$restore_args -f $dump_file  -L $session_label $restore_dir"
     echo "xfsrestore $opts" | _dir_filter
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1184,7 +1184,7 @@ _do_restore_file_cum()
     echo "Restoring cumumlative from file..."
     opts="$_restore_debug$restore_args -f $dump_file -r $restore_dir"
     echo "xfsrestore $opts" | _dir_filter
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 _do_restore_toc()
@@ -1195,7 +1195,7 @@ _do_restore_toc()
     opts="$_restore_debug$restore_args -f $dump_file -t"
     echo "xfsrestore $opts" | _dir_filter
     cd $SCRATCH_MNT # for IRIX which needs xfs cwd
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter_main |\
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter_main |\
     _check_quota_file |\
     _check_quota_entries |\
     $AWK_PROG 'NF != 1 { print; next }
@@ -1226,7 +1226,7 @@ _do_restore_multi_file()
     echo "Restoring from file..."
     opts="$_restore_debug$restore_args $multi_args -L $session_label $restore_dir"
     echo "xfsrestore $opts" | _dir_filter
-    $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter
 }
 
 #
@@ -1246,7 +1246,7 @@ _do_dump_restore()
     restore_opts="$_restore_debug$restore_args - $restore_dir"
     dump_opts="$_dump_debug$dump_args -s $dump_sdir - $SCRATCH_MNT"
     echo "xfsdump $dump_opts | xfsrestore $restore_opts" | _dir_filter
-    $XFSDUMP_PROG $dump_opts 2>$tmp.dump.mlog | $XFSRESTORE_PROG $restore_opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
+    $XFSDUMP_PROG $dump_opts 2>$tmp.dump.mlog | $XFSRESTORE_PROG $restore_opts 2>&1 | tee -a $seqres.full | _dump_filter
     _dump_filter <$tmp.dump.mlog
 }
 
@@ -1262,8 +1262,8 @@ _ls_compare_sub()
     # verify we got back what we dumped
     #
     echo "Comparing listing of dump directory with restore directory"
-    ls -nR $dump_dir | tee -a $RESULT_DIR/$seq.full | _ls_filter >$tmp.dump_dir
-    ls -nR $restore_dir/$dump_sdir | tee -a $RESULT_DIR/$seq.full | _ls_filter \
+    ls -nR $dump_dir | tee -a $seqres.full | _ls_filter >$tmp.dump_dir
+    ls -nR $restore_dir/$dump_sdir | tee -a $seqres.full | _ls_filter \
     | sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
 
     diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
@@ -1285,8 +1285,8 @@ _ls_nodate_compare_sub()
     # verify we got back what we dumped
     #
     echo "Comparing listing of dump directory with restore directory"
-    ls -nR $dump_dir | tee -a $RESULT_DIR/$seq.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
-    ls -nR $restore_dir/$dump_sdir | tee -a $RESULT_DIR/$seq.full | _ls_filter \
+    ls -nR $dump_dir | tee -a $seqres.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
+    ls -nR $restore_dir/$dump_sdir | tee -a $seqres.full | _ls_filter \
     | _ls_nodate_filter | sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
 
     diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
@@ -1359,13 +1359,13 @@ _diff_compare_eas()
     echo "Comparing dump directory with restore directory"
     echo "Looking at the extended attributes (EAs)"
     echo "EAs on dump"
-    _get_eas_on_path $dump_dir | tee $RESULT_DIR/$seq.ea1 | _dir_filter
+    _get_eas_on_path $dump_dir | tee $seqres.ea1 | _dir_filter
     echo "EAs on restore"
     _get_eas_on_path $restore_dir/$dump_sdir \
     | sed -e "s#$restore_sdir\/##" \
-    | tee $RESULT_DIR/$seq.ea2 \
+    | tee $seqres.ea2 \
     | _dir_filter
-    diff -s $RESULT_DIR/$seq.ea1 $RESULT_DIR/$seq.ea2
+    diff -s $seqres.ea1 $seqres.ea2
 }
 
 
@@ -1384,7 +1384,7 @@ _diff_compare()
 #
 _dump_inventory()
 {
-    $XFSDUMP_PROG $_dump_debug -I | tee -a $RESULT_DIR/$seq.full | _dump_filter_main
+    $XFSDUMP_PROG $_dump_debug -I | tee -a $seqres.full | _dump_filter_main
 }
 
 #
@@ -1394,9 +1394,9 @@ _dump_inventory()
 _do_invutil()
 {
     host=`hostname`
-    echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$RESULT_DIR/$seq.full
+    echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$seqres.full
     $XFSINVUTIL_PROG $_invutil_debug $* -M $host:$SCRATCH_MNT "$middate" \
-    | tee -a $RESULT_DIR/$seq.full | _invutil_filter
+    | tee -a $seqres.full | _invutil_filter
 }
 
 #
@@ -1416,7 +1416,7 @@ _check_quota()
     $here/src/feature -P $SCRATCH_DEV && pquota=1
 
     $AWK_PROG -v uquota=$uquota -v gquota=$gquota -v pquota=$pquota \
-	      -v full=$RESULT_DIR/$seq.full -v usermsg="$usermsg" \
+	      -v full=$seqres.full -v usermsg="$usermsg" \
 	      -v groupmsg="$groupmsg" -v projectmsg="$projectmsg" '
 	$0 ~ projectmsg {
 			print "Found project quota:", $0 >>full
common/filestreams +2 -2
index b3aee27..590fa7f 100644
@@ -116,7 +116,7 @@ _check_for_dupes()
                 for this_num_two in $num_str_two; do
                         if [ "$this_num_one" == "$this_num_two" ]; then
 				echo "duplicate AG $this_num_one found" \
-					>> $RESULT_DIR/$seq.full
+					>> $seqres.full
 				return 1
 			fi
                 done
@@ -189,7 +189,7 @@ _test_streams() {
 	stream_index=1
 	while [ $stream_index -le $stream_count ]; do
 		this_stream_ags=`_get_stream_ags stream${stream_index}-dir`
-		echo "stream $stream_index AGs: $this_stream_ags" >> $RESULT_DIR/$seq.full
+		echo "stream $stream_index AGs: $this_stream_ags" >> $seqres.full
 		_check_for_dupes "$ags_seen" "$this_stream_ags"
 		if [ $? -ne 0 ]; then
 			# this stream is not in seperate AGs to previous streams
common/log +18 -18
index e0e2bc6..88e64bc 100644
@@ -20,7 +20,7 @@
 # Created by [email protected] & [email protected]
 #
 
-fulldir=$RESULT_DIR/$seq.fulldir
+fulldir=$seqres.fulldir
 rm -rf $fulldir
 
 _cleanup_logfiles()
@@ -33,16 +33,16 @@ _cleanup_logfiles()
 
 _full()
 {
-    echo ""            >>$RESULT_DIR/$seq.full      
-    echo "*** $* ***"  >>$RESULT_DIR/$seq.full
-    echo ""            >>$RESULT_DIR/$seq.full
+    echo ""            >>$seqres.full      
+    echo "*** $* ***"  >>$seqres.full
+    echo ""            >>$seqres.full
 }
 
 _echofull()
 {
-    echo ""            | tee -a $RESULT_DIR/$seq.full      
-    echo "*** $* ***"  | tee -a $RESULT_DIR/$seq.full
-    echo ""            | tee -a $RESULT_DIR/$seq.full
+    echo ""            | tee -a $seqres.full      
+    echo "*** $* ***"  | tee -a $seqres.full
+    echo ""            | tee -a $seqres.full
 }
 
 # Handle the operations which get split over Log Record
@@ -212,13 +212,13 @@ _filter_logprint()
 _check_log()
 {
     _full "clean_log : xfs_logprint"
-    _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+    _scratch_xfs_logprint -t | tee -a $seqres.full \
         | head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
 }
 
 _print_logstate()
 {
-    _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full >$tmp.logprint
+    _scratch_xfs_logprint -t | tee -a $seqres.full >$tmp.logprint
     if grep -q "<DIRTY>" $tmp.logprint; then
 	echo "dirty log"
     fi
@@ -288,7 +288,7 @@ _mkfs_log()
     # mkfs options to append to log size otion can be specified ($*)
     export MKFS_OPTIONS="-l size=2000b -l lazy-count=1 $*"
     _full "mkfs"
-    _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mkfs_xfs >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS"
 	return 1
@@ -305,7 +305,7 @@ _create_log()
 {
     # mount the FS
     _full "mount"
-    _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mount >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "mount failed: $MOUNT_OPTIONS"
 	return 1
@@ -318,7 +318,7 @@ _create_log()
 
     # unmount the FS
     _full "umount"
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "umount failed"
 	return 1
@@ -334,7 +334,7 @@ _create_log_sync()
 {
     # mount the FS
     _full " mount"
-    _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
+    _scratch_mount >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "mount failed: $MOUNT_OPTIONS"
 	return 1
@@ -349,7 +349,7 @@ _create_log_sync()
 
     # unmount the FS
     _full "umount"
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
     if [ $? -ne 0 ] ; then 
 	_echofull "umount failed"
 	return 1
@@ -448,21 +448,21 @@ _require_v2log()
 {
     # test out mkfs to see if it supports "-l version=2"
     export MKFS_OPTIONS="-l version=2"
-    if ! _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1; then
+    if ! _scratch_mkfs_xfs >>$seqres.full 2>&1; then
         _notrun "mkfs does not support v2 logs"
     fi
 
     # test out mount to see if it mounts a v2 log fs
     export MOUNT_OPTIONS="-o logbsize=32k"
-    if ! _scratch_mount >>$RESULT_DIR/$seq.full 2>&1; then
+    if ! _scratch_mount >>$seqres.full 2>&1; then
         _notrun "mount/kernel does not support v2 logs"
     fi
 
     # check after unmount to see if it is clean
     # i.e. it is not a 6.5.25 buggy version checking kernel
     touch $SCRATCH_MNT/file
-    umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
-    if _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
+    umount $SCRATCH_DEV >>$seqres.full 2>&1
+    if _scratch_xfs_logprint -t | tee -a $seqres.full \
         | head | grep -q "<DIRTY>"; then
         _notrun "kernel does not support v2 logs"
     fi
common/quota +9 -9
index ff80382..7f349ab 100644
@@ -96,8 +96,8 @@ _file_as_id()
 
     parent=`dirname $1`
     if [ $3 = p ]; then
-	echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full
-	$XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full 2>&1
+	echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full
+	$XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full 2>&1
 	magik='$>'	# (irrelevent, above set projid-inherit-on-parent)
     elif [ $3 = u ]; then
 	magik='$>'	# perlspeak for effective uid
@@ -107,7 +107,7 @@ _file_as_id()
 	_notrun "broken type in call to _file_as_id in test $seq"
     fi
 
-    perl <<EOF >>$RESULT_DIR/$seq.full 2>&1
+    perl <<EOF >>$seqres.full 2>&1
 	\$| = 1;
 	$magik = $2;
 	if ($5 == 0) {
@@ -119,11 +119,11 @@ _file_as_id()
 	}
 EOF
 # for debugging the above euid change, try... [need write in cwd]
-#	exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$RESULT_DIR/$seq.full 2>&1";
+#	exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$seqres.full 2>&1";
 
     if [ $3 = p ]; then
-	echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full
-	$XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full 2>&1
+	echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full
+	$XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full 2>&1
     fi
 }
 
@@ -198,8 +198,8 @@ _qsetup()
 	_notrun "No quota support at mount time"
     fi
 
-    echo "Using output from '" `ls -l $seq.out` "'" >>$RESULT_DIR/$seq.full
-    echo "and using type=$type id=$id" >>$RESULT_DIR/$seq.full
+    echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
+    echo "and using type=$type id=$id" >>$seqres.full
 }
 
 #
@@ -229,7 +229,7 @@ _qmount_option()
 
 	# Ensure we have the given quota option - duplicates are fine
 	export MOUNT_OPTIONS="$MOUNT_OPTIONS -o $1"
-	echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$RESULT_DIR/$seq.full
+	echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seqres.full
 }
 
 _check_quota_usage()
common/rc +49 -49
index 3aa8742..ca40605 100644
@@ -358,9 +358,9 @@ _scratch_mkfs_xfs()
 
     if [ $mkfs_status -ne 0 -a ! -z "$extra_mkfs_options" ]; then
         echo "** mkfs failed with extra mkfs options added to \"$MKFS_OPTIONS\" by test $seq **" \
-            >>$RESULT_DIR/$seq.full
+            >>$seqres.full
         echo "** attempting to mkfs using only test $seq options: $extra_mkfs_options **" \
-            >>$RESULT_DIR/$seq.full
+            >>$seqres.full
         # running mkfs again. overwrite previous mkfs output files
         $MKFS_XFS_PROG $SCRATCH_OPTIONS $extra_mkfs_options $SCRATCH_DEV \
             2>$tmp_dir.mkfserr 1>$tmp_dir.mkfsstd
@@ -796,7 +796,7 @@ _is_block_dev()
     fi
 }
 
-# Do a command, log it to $RESULT_DIR/$seq.full, optionally test return status
+# Do a command, log it to $seqres.full, optionally test return status
 # and die if command fails. If called with one argument _do executes the
 # command, logs it, and returns its exit status. With two arguments _do
 # first prints the message passed in the first argument, and then "done"
@@ -804,7 +804,7 @@ _is_block_dev()
 # second argument. If the command fails and the variable _do_die_on_error
 # is set to "always" or the two argument form is used and _do_die_on_error
 # is set to "message_only" _do will print an error message to
-# $RESULT_DIR/$seq.out and exit.
+# $seqres.out and exit.
 
 _do()
 {
@@ -819,9 +819,9 @@ _do()
 	status=1; exit
     fi
 
-    (eval "echo '---' \"$_cmd\"") >>$RESULT_DIR/$seq.full
+    (eval "echo '---' \"$_cmd\"") >>$seqres.full
     (eval "$_cmd") >$tmp._out 2>&1; ret=$?
-    cat $tmp._out | _fix_malloc >>$RESULT_DIR/$seq.full
+    cat $tmp._out | _fix_malloc >>$seqres.full
     if [ $# -eq 2 ]; then
 	if [ $ret -eq 0 ]; then
 	    echo "done"
@@ -834,7 +834,7 @@ _do()
 	    -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
     then
 	[ $# -ne 2 ] && echo
-	eval "echo \"$_cmd\" failed \(returned $ret\): see $RESULT_DIR/$seq.full"
+	eval "echo \"$_cmd\" failed \(returned $ret\): see $seqres.full"
 	status=1; exit
     fi
 
@@ -845,7 +845,7 @@ _do()
 #
 _notrun()
 {
-    echo "$*" > $RESULT_DIR/$seq.notrun
+    echo "$*" > $seqres.notrun
     echo "$seq not run: $*"
     status=0
     exit
@@ -855,8 +855,8 @@ _notrun()
 #
 _fail()
 {
-    echo "$*" | tee -a $RESULT_DIR/$seq.full
-    echo "(see $RESULT_DIR/$seq.full for details)"
+    echo "$*" | tee -a $seqres.full
+    echo "(see $seqres.full for details)"
     status=1
     exit 1
 }
@@ -1343,12 +1343,12 @@ _check_generic_filesystem()
     fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1
     if [ $? -ne 0 ]
     then
-        echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $RESULT_DIR/$seq.full)"
+        echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $seqres.full)"
 
-        echo "_check_generic filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
-        echo "*** fsck.$FSTYP output ***"	>>$RESULT_DIR/$seq.full
-        cat $tmp.fsck				>>$RESULT_DIR/$seq.full
-        echo "*** end fsck.$FSTYP output"	>>$RESULT_DIR/$seq.full
+        echo "_check_generic filesystem: filesystem on $device is inconsistent" >>$seqres.full
+        echo "*** fsck.$FSTYP output ***"	>>$seqres.full
+        cat $tmp.fsck				>>$seqres.full
+        echo "*** end fsck.$FSTYP output"	>>$seqres.full
 
         ok=0
     fi
@@ -1356,9 +1356,9 @@ _check_generic_filesystem()
 
     if [ $ok -eq 0 ]
     then
-        echo "*** mount output ***"		>>$RESULT_DIR/$seq.full
-        _mount					>>$RESULT_DIR/$seq.full
-        echo "*** end mount output"		>>$RESULT_DIR/$seq.full
+        echo "*** mount output ***"		>>$seqres.full
+        _mount					>>$seqres.full
+        echo "*** end mount output"		>>$seqres.full
     elif [ "$type" = "$FSTYP" ]
     then
 	# was mounted ...
@@ -1412,12 +1412,12 @@ _check_xfs_filesystem()
                 | tee $tmp.logprint | grep -q "<CLEAN>"
     if [ $? -ne 0 -a "$HOSTOS" = "Linux" ]
     then
-        echo "_check_xfs_filesystem: filesystem on $device has dirty log (see $RESULT_DIR/$seq.full)"
+        echo "_check_xfs_filesystem: filesystem on $device has dirty log (see $seqres.full)"
 
-        echo "_check_xfs_filesystem: filesystem on $device has dirty log"   >>$RESULT_DIR/$seq.full
-        echo "*** xfs_logprint -t output ***"	>>$RESULT_DIR/$seq.full
-        cat $tmp.logprint			>>$RESULT_DIR/$seq.full
-        echo "*** end xfs_logprint output"	>>$RESULT_DIR/$seq.full
+        echo "_check_xfs_filesystem: filesystem on $device has dirty log"   >>$seqres.full
+        echo "*** xfs_logprint -t output ***"	>>$seqres.full
+        cat $tmp.logprint			>>$seqres.full
+        echo "*** end xfs_logprint output"	>>$seqres.full
 
         ok=0
     fi
@@ -1431,12 +1431,12 @@ _check_xfs_filesystem()
     fi
     if [ -s $tmp.fs_check ]
     then
-        echo "_check_xfs_filesystem: filesystem on $device is inconsistent (c) (see $RESULT_DIR/$seq.full)"
+        echo "_check_xfs_filesystem: filesystem on $device is inconsistent (c) (see $seqres.full)"
 
-        echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
-        echo "*** xfs_check output ***"		>>$RESULT_DIR/$seq.full
-        cat $tmp.fs_check			>>$RESULT_DIR/$seq.full
-        echo "*** end xfs_check output"		>>$RESULT_DIR/$seq.full
+        echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$seqres.full
+        echo "*** xfs_check output ***"		>>$seqres.full
+        cat $tmp.fs_check			>>$seqres.full
+        echo "*** end xfs_check output"		>>$seqres.full
 
         ok=0
     fi
@@ -1444,12 +1444,12 @@ _check_xfs_filesystem()
     $XFS_REPAIR_PROG -n $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
     if [ $? -ne 0 ]
     then
-        echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $RESULT_DIR/$seq.full)"
+        echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $seqres.full)"
 
-        echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
-        echo "*** xfs_repair -n output ***"	>>$RESULT_DIR/$seq.full
-        cat $tmp.repair | _fix_malloc		>>$RESULT_DIR/$seq.full
-        echo "*** end xfs_repair output"	>>$RESULT_DIR/$seq.full
+        echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$seqres.full
+        echo "*** xfs_repair -n output ***"	>>$seqres.full
+        cat $tmp.repair | _fix_malloc		>>$seqres.full
+        echo "*** end xfs_repair output"	>>$seqres.full
 
         ok=0
     fi
@@ -1457,9 +1457,9 @@ _check_xfs_filesystem()
 
     if [ $ok -eq 0 ]
     then
-        echo "*** mount output ***"		>>$RESULT_DIR/$seq.full
-        _mount					>>$RESULT_DIR/$seq.full
-        echo "*** end mount output"		>>$RESULT_DIR/$seq.full
+        echo "*** mount output ***"		>>$seqres.full
+        _mount					>>$seqres.full
+        echo "*** end mount output"		>>$seqres.full
     elif [ "$type" = "xfs" ]
     then
 	_mount_or_remount_rw "$extra_mount_options" $device $mountpoint
@@ -1507,12 +1507,12 @@ _check_udf_filesystem()
         OPT_ARG="-lastvalidblock $LAST_BLOCK"
     fi
 
-    rm -f $RESULT_DIR/$seq.checkfs
+    rm -f $seqres.checkfs
     sleep 1 # Due to a problem with time stamps in udf_test
-    $here/src/udf_test $OPT_ARG $device | tee $RESULT_DIR/$seq.checkfs | egrep "Error|Warning" | \
+    $here/src/udf_test $OPT_ARG $device | tee $seqres.checkfs | egrep "Error|Warning" | \
 	_udf_test_known_error_filter | \
 	egrep -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" | \
-	sed "s/^.*$/Warning UDF Verifier reported errors see $RESULT_DIR/$seq.checkfs./g"
+	sed "s/^.*$/Warning UDF Verifier reported errors see $seqres.checkfs./g"
 
 }
 
@@ -1553,12 +1553,12 @@ _check_btrfs_filesystem()
     btrfsck $device >$tmp.fsck 2>&1
     if [ $? -ne 0 ]
     then
-        echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $RESULT_DIR/$seq.full)"
+        echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $seqres.full)"
 
-        echo "_check_btrfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
-        echo "*** fsck.$FSTYP output ***"	>>$RESULT_DIR/$seq.full
-        cat $tmp.fsck				>>$RESULT_DIR/$seq.full
-        echo "*** end fsck.$FSTYP output"	>>$RESULT_DIR/$seq.full
+        echo "_check_btrfs_filesystem: filesystem on $device is inconsistent" >>$seqres.full
+        echo "*** fsck.$FSTYP output ***"	>>$seqres.full
+        cat $tmp.fsck				>>$seqres.full
+        echo "*** end fsck.$FSTYP output"	>>$seqres.full
 
         ok=0
     fi
@@ -1566,9 +1566,9 @@ _check_btrfs_filesystem()
 
     if [ $ok -eq 0 ]
     then
-        echo "*** mount output ***"		>>$RESULT_DIR/$seq.full
-        _mount					>>$RESULT_DIR/$seq.full
-        echo "*** end mount output"		>>$RESULT_DIR/$seq.full
+        echo "*** mount output ***"		>>$seqres.full
+        _mount					>>$seqres.full
+        echo "*** end mount output"		>>$seqres.full
     elif [ "$type" = "$FSTYP" ]
     then
 	# was mounted ...
@@ -2053,8 +2053,8 @@ _scale_fsstress_args()
 
 run_check()
 {
-	echo "# $@" >> $RESULT_DIR/$seq.full 2>&1
-	"$@" >> $RESULT_DIR/$seq.full 2>&1 || _fail "failed: '$@'"
+	echo "# $@" >> $seqres.full 2>&1
+	"$@" >> $seqres.full 2>&1 || _fail "failed: '$@'"
 }
 
 ################################################################################
common/scsi_debug +1 -1
index f05c8db..d073b6d 100644
@@ -47,7 +47,7 @@ _get_scsi_debug_dev()
 		let phys_exp=phys_exp+1
 	done
 	opts="sector_size=$logical physblk_exp=$phys_exp lowest_aligned=$unaligned dev_size_mb=$size"
-	echo "scsi_debug options $opts" >> $RESULT_DIR/$seq.full
+	echo "scsi_debug options $opts" >> $seqres.full
 	modprobe scsi_debug $opts
 	[ $? -eq 0 ] || _fail "scsi_debug modprobe failed"
 	sleep 1
tests/generic/001 +4 -4
index 35c88f2..aa82441 100755
@@ -190,7 +190,7 @@ _mark_iteration()
 #
 _chain()
 {
-    $AWK_PROG -v full_file=$here/$seqres.full -v verify=$verify <$tmp.config '
+    $AWK_PROG -v full_file=$seqres.full -v verify=$verify <$tmp.config '
 BEGIN	{ nfile = 0 }
 /^\#/	{ next }
 	{ file[nfile] = $1
@@ -238,7 +238,7 @@ END	{ srand('$iter')
 	    }
 	  }
 	}' \
-	| tee -a $here/$seqres.full | sh
+	| tee -a $seqres.full | sh
 }
 
 _check()
@@ -292,7 +292,7 @@ _cleanup()
     fi
 }
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 status=0
 _cleanup
 status=1
@@ -306,7 +306,7 @@ _setup
 for iter in 1 2 3 4 5
 do
     echo -n "iter $iter chain ... "
-    echo "iter $iter" >> $here/$seqres.full
+    echo "iter $iter" >> $seqres.full
     _chain
     _check
     if [ -f $tmp.bad ]
tests/generic/010 +1 -1
index d338db6..0bdfdd5 100755
@@ -64,7 +64,7 @@ rm -f $seqres.full
 
 cd $testdir
 
-$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seqres.full | _filter_dbtest
+$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $seqres.full | _filter_dbtest
 
 # success, all done
 exit
tests/generic/013 +6 -6
index a9c07c4..b364f1b 100755
@@ -78,11 +78,11 @@ _do_test()
     if ! $FSSTRESS_PROG $_param $FSSTRESS_AVOID -v -m 8 -n $_count -d $out >>$dbgoutfile 2>&1
     then
         echo "    fsstress (count=$_count) returned $? - see $seqres.full"
-        echo "--------------------------------------"       >>$here/$seqres.full
-        echo "$_n - output from fsstress:"                  >>$here/$seqres.full
-        echo "--------------------------------------"       >>$here/$seqres.full
-        echo "<NOT LOGGED>"                                 >>$here/$seqres.full
-        #cat $tmp.out                                       >>$here/$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from fsstress:"                  >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "<NOT LOGGED>"                                 >>$seqres.full
+        #cat $tmp.out                                       >>$seqres.full
         status=1
     fi
 
@@ -96,7 +96,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 count=1000
tests/generic/074 +1 -1
index 6df8c57..b9e1595 100755
@@ -108,7 +108,7 @@ _process_args()
 
 
 # real QA test starts here
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 _supported_fs generic
 _supported_os IRIX Linux
tests/generic/075 +5 -5
index 52e6a43..4477db4 100755
@@ -78,10 +78,10 @@ _do_test()
     cd $out
     if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
-	echo "    fsx ($_param) failed, $? - compare $seq.$_n.{good,bad,fsxlog}"
-	mv $out/$seq.$_n $here/$seq.$_n.full
-	od -xAx $here/$seq.$_n.full > $here/$seq.$_n.bad
-	od -xAx $here/$seq.$_n.fsxgood > $here/$seq.$_n.good
+	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
+	mv $out/$seq.$_n $seqres.$_n.full
+	od -xAx $seqres.$_n.full > $seqres.$_n.bad
+	od -xAx $seqres.$_n.fsxgood > $seqres.$_n.good
 	status=1
 	exit
     fi
@@ -139,7 +139,7 @@ echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 _check_test_fs
tests/generic/089 +2 -2
index c4c76e2..fdddad4 100755
@@ -73,8 +73,8 @@ mtab()
 
 	echo directory entries:
 	ls | grep mtab
-	echo directory entries >> $here/$seqres.full
-	ls -li >> $here/$seqres.full
+	echo directory entries >> $seqres.full
+	ls -li >> $seqres.full
 }
 
 # directory with only a few entries
tests/generic/100 +4 -4
index 123dc5f..f4b0c8f 100755
@@ -62,10 +62,10 @@ rm -rf $POPULATED_DIR
 rm -f $TEMP_DIR/$TAR_FILE
 
 # Create the new directory structure
-_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seqres.full 2>&1
+_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$seqres.full 2>&1
 
 # Then tar up the directory structure
-tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seqres.full 2>&1
+tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$seqres.full 2>&1
 
 # create f/s
 _require_scratch
@@ -73,12 +73,12 @@ _setup_testdir
 
 # untar on f/s
 cd $testdir
-tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seqres.full 2>&1
+tar -xRvf $TEMP_DIR/$TAR_FILE >>$seqres.full 2>&1
 cd $here
 
 
 # use diff -qr to compare
-ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seqres.full 2>&1
+ls -R -l ${testdir}${POPULATED_DIR} >>$seqres.full 2>&1
 diff -qr $POPULATED_DIR ${testdir}${POPULATED_DIR}
 
 cd /
tests/generic/112 +2 -2
index 5f5b19d..0cd19db 100755
@@ -79,7 +79,7 @@ _do_test()
     if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
 	echo "    fsx ($_param) returned $? - see $seq.$_n.full"
-	mv $seq.$_n.fsxlog $here/$seq.$_n.full
+	mv $seq.$_n.fsxlog $seqres.$_n.full
 	status=1
 	exit
     fi
@@ -140,7 +140,7 @@ echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
 
 _setup_testdir
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 echo "brevity is wit..."
 
 _check_test_fs
tests/generic/192 +1 -1
index 66d8a66..13784f7 100755
@@ -67,7 +67,7 @@ time2=`_access_time $testfile | tee -a $seqres.full`
 cd /
 umount $TEST_DIR
 _test_mount
-time3=`_access_time $testfile | tee -a $here/$seqres.full`
+time3=`_access_time $testfile | tee -a $seqres.full`
 
 delta1=`expr $time2 - $time1`
 delta2=`expr $time3 - $time1`
tests/generic/232 +4 -4
index ee0e16e..2402c45 100755
@@ -39,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -55,11 +55,11 @@ _fsstress()
 	count=2000
 	args=`_scale_fsstress_args -d $out -n $count -p 7`
 
-	echo "fsstress $args" >> tee -a $here/$seqres.full
-	if ! $FSSTRESS_PROG $args | tee -a $here/$seqres.full | _filter_num
+	echo "fsstress $args" >> tee -a $seqres.full
+	if ! $FSSTRESS_PROG $args | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 }
tests/generic/233 +4 -4
index 1eb68c5..2b6cd2f 100755
@@ -43,7 +43,7 @@ FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -62,11 +62,11 @@ _fsstress()
 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
 -n $count -d $out -p 7`
 
-	echo "fsstress $args" >> tee -a $here/$seqres.full
-	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seqres.full | _filter_num
+	echo "fsstress $args" >> tee -a $seqres.full
+	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 }
tests/generic/269 +2 -2
index 6e33368..684cf42 100755
@@ -45,7 +45,7 @@ _workout()
 	enospc_time=2
 	out=$SCRATCH_MNT/fsstress.$$
 	args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out`
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	$FSSTRESS_PROG $args > /dev/null 2>&1 &
 	pid=$!
 	echo "Run dd writers in parallel"
@@ -53,7 +53,7 @@ _workout()
 	do
 		# File will be opened with O_TRUNC each time
 		dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M \
-			>> $here/$seqres.full 2>&1
+			>> $seqres.full 2>&1
 		sleep $enospc_time
 	done
 	kill $pid
tests/generic/270 +2 -2
index 294bb62..b5ed7af 100755
@@ -48,7 +48,7 @@ _workout()
 	enospc_time=2
 	out=$SCRATCH_MNT/fsstress.$$
 	args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out`
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	# Grant chown capability 
 	cp $FSSTRESS_PROG  $tmp.fsstress.bin
 	if [ "`whereis setcap`" == "setcap:" ]; then
@@ -65,7 +65,7 @@ _workout()
 		# File will be opened with O_TRUNC each time
 		su $qa_user -c "dd if=/dev/zero \
 			of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M " \
-			>> $here/$seqres.full 2>&1
+			>> $seqres.full 2>&1
 		sleep $enospc_time
 	done
 
tests/shared/305 +6 -6
index bcb235f..91cbf03 100644
@@ -62,7 +62,7 @@ disallow_fail_make_request()
 start_fail_scratch_dev()
 {
     echo "Force SCRATCH_DEV device failure"
-    echo " echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $here/$seqres.full
+    echo " echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $seqres.full
     echo 1 > /sys/block/$SCRATCH_BDEV/make-it-fail
 
 }
@@ -70,7 +70,7 @@ start_fail_scratch_dev()
 stop_fail_scratch_dev()
 {
     echo "Make SCRATCH_DEV device operable again"
-    echo " echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $here/$seqres.full
+    echo " echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail" >> $seqres.full
     echo 0 > /sys/block/$SCRATCH_BDEV/make-it-fail
 
 }
@@ -139,12 +139,12 @@ _workout()
 	echo ""
 	echo "Start fsstress.."
 	echo ""
-	echo "fsstress $args" >> $here/$seqres.full
+	echo "fsstress $args" >> $seqres.full
 	$FSSTRESS_PROG $args > /dev/null 2>&1 &
 	fs_pid=$!
 	echo "Start fio.."
 	cat $tmp-$seq.fio >>  $seqres.full
-	$FIO_PROG $tmp-$seq.fio >> $here/$seqres.full 2>&1 &
+	$FIO_PROG $tmp-$seq.fio >> $seqres.full 2>&1 &
 	fio_pid=$!
 
 	# Let's it work for awhile, and force device failure
@@ -154,7 +154,7 @@ _workout()
 	# that so buffered write(2) may succeed, but any integrity operations
 	# such as (sync, fsync, fdatasync, direct-io) should fail.
 	dd if=/dev/zero of=$SCRATCH_MNT/touch_failed_filesystem count=1 bs=4k conv=fsync \
-	    >> $here/$seqres.full 2>&1 && \
+	    >> $seqres.full 2>&1 && \
 	    _fail "failed: still able to perform integrity fsync on $SCRATCH_MNT"
 
 	kill $fs_pid
@@ -176,7 +176,7 @@ _workout()
 
 # real QA test starts here
 
-_scratch_mkfs >> $here/$seqres.full 2>&1 || _fail "mkfs failed"
+_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
 _scratch_mount || _fail "mount failed"
 allow_fail_make_request
 _workout
tests/xfs/008 +9 -9
index 4bf6c00..e7a1768 100755
@@ -73,14 +73,14 @@ _do_test()
 	fi
     else
         echo "    randholes returned $? - see $seq.out.full"
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from randholes:"                 >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        cat $tmp.out                                        >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from bmap:"                      >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        xfs_bmap -vvv $out                                  >>$here/$seq.out.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from randholes:"                 >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        cat $tmp.out                                        >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from bmap:"                      >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        xfs_bmap -vvv $out                                  >>$seqres.full
         status=1
     fi
 }
@@ -91,7 +91,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seq.out.full
+rm -f $seqres.full
 
 # Note on special numbers here.
 #
tests/xfs/012 +15 -15
index 87c0b85..cd9c485 100755
@@ -62,7 +62,7 @@ _do_test()
     echo "-----------------------------------------------"
     if  ! $here/src/holes $_param $out >$tmp.out
     then
-        echo "    holes returned $? - see $seq.out.full"
+        echo "    holes returned $? - see $seqres.full"
         failed=1
         status=1
     fi
@@ -78,7 +78,7 @@ _do_test()
 
         if [ $count -ne $_count ]
         then
-            echo "    unexpected number of holes - see $seq.out.full"
+            echo "    unexpected number of holes - see $seqres.full"
             status=1
             failed=1
         fi
@@ -86,18 +86,18 @@ _do_test()
 
     if [ $failed -eq 1 ]
     then
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from holes:"                     >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        cat $tmp.out                                        >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from bmap:"                      >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        xfs_bmap -vvv $out                                  >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        echo "$_n - output from ls -li:"                    >>$here/$seq.out.full
-        echo "--------------------------------------"       >>$here/$seq.out.full
-        ls -li $out                                         >>$here/$seq.out.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from holes:"                     >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        cat $tmp.out                                        >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from bmap:"                      >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        xfs_bmap -vvv $out                                  >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        echo "$_n - output from ls -li:"                    >>$seqres.full
+        echo "--------------------------------------"       >>$seqres.full
+        ls -li $out                                         >>$seqres.full
         status=1
     fi
 }
@@ -108,7 +108,7 @@ _supported_os IRIX Linux
 
 _setup_testdir
 
-rm -f $here/$seq.out.full
+rm -f $seqres.full
 
 # small & fairly dense
 _do_test 1 "-l 40960000 -b 40960 -i 10 -c 1" 100
tests/xfs/024 +2 -2
index 68e9788..2e13288 100755
@@ -43,11 +43,11 @@ _require_tape $TAPE_DEV
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 _erase_hard
 _do_dump
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 _erase_hard
 _do_dump -l 1
 _do_restore
tests/xfs/067 +3 -3
index fbfaa1f..27f5713 100755
@@ -50,11 +50,11 @@ isize=0
 _scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs
 [ $? -eq 0 ] && source $tmp.mkfs
 if [ "$isize" -lt 1024 ]; then
-    _scratch_mkfs_xfs -i size=1024 >>$here/$seqres.full \
+    _scratch_mkfs_xfs -i size=1024 >>$seqres.full \
 	|| _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
 fi
-_scratch_mount >>$here/$seqres.full || _fail "mount failed"
-xfs_info $SCRATCH_MNT >>$here/$seqres.full
+_scratch_mount >>$seqres.full || _fail "mount failed"
+xfs_info $SCRATCH_MNT >>$seqres.full
 cd $SCRATCH_MNT
 
 echo ""
tests/xfs/114 +15 -15
index 4dfdf86..1029dbc 100755
@@ -80,8 +80,8 @@ _test_create()
 	p=dir2/dir3/dir4/file4
 	touch $p
 
-	#_print_names $p >>$here/$seqres.full
-	_print_names $p | tee -a $here/$seqres.full
+	#_print_names $p >>$seqres.full
+	_print_names $p | tee -a $seqres.full
 
 	_check_paths $SCRATCH_MNT/$p
 }
@@ -131,13 +131,13 @@ _test_hardlink()
 		ln $p $x
 	done
 
-	_print_names $p >>$here/$seqres.full
+	_print_names $p >>$seqres.full
 
 	echo ""
 	echo "print out names and check after created hardlinks"
 	echo ""
 	for x in $paths; do
-		_print_names $x | tee -a $here/$seqres.full
+		_print_names $x | tee -a $seqres.full
 		_check_paths $SCRATCH_MNT/$x
 	done
 
@@ -161,7 +161,7 @@ _test_hardlink()
 	echo ""
 	for x in $paths; do
 		if [ -e $x ]; then 
-			_print_names $x | tee -a $here/$seqres.full
+			_print_names $x | tee -a $seqres.full
 			_check_paths $SCRATCH_MNT/$x
 		fi
 	done
@@ -230,7 +230,7 @@ _test_rename()
 
 _filter_num()
 {
-	tee -a $here/$seqres.full |\
+	tee -a $seqres.full |\
 	sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
 	    -e 's/[0-9][0-9]* paths/P paths/g' \
 	    -e 's/seed = [0-9][0-9]*/seed = S/'
@@ -255,7 +255,7 @@ _test_fsstress()
 	if ! $FSSTRESS_PROG $args | _filter_num
 	then
 		echo "    fsstress $args returned $?"
-		cat $tmp.out | tee -a $here/$seqres.full
+		cat $tmp.out | tee -a $seqres.full
 		status=1
 	fi
 
@@ -284,8 +284,8 @@ _test_dirstress()
 	if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
 	then
 		echo "    dirstress failed"
-		echo "*** dirstress $args" | tee -a $here/$seqres.full
-		cat $tmp.out >>$here/$seqres.full
+		echo "*** dirstress $args" | tee -a $seqres.full
+		cat $tmp.out >>$seqres.full
 		status=1
 		exit
 	fi
@@ -295,8 +295,8 @@ _test_dirstress()
 	if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
 	then
 		echo "    dirstress failed"
-		echo "*** dirstress $args" | tee -a $here/$seqres.full
-		cat $tmp.out >>$here/$seqres.full
+		echo "*** dirstress $args" | tee -a $seqres.full
+		cat $tmp.out >>$seqres.full
 		status=1
 		exit
 	fi
@@ -316,16 +316,16 @@ _require_scratch
 _require_attrs
 _need_to_be_root
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
     || _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs -i parent=1 >>$seqres.full 2>&1 \
     || _notrun "parent inodes not supported"
 
 echo "mount"
-_scratch_mount >>$here/$seqres.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
     || _fail "mount failed: $MOUNT_OPTIONS"
 
 # real QA test starts here
tests/xfs/115 +4 -4
index 0933c54..967a904 100755
@@ -102,16 +102,16 @@ _supported_os IRIX
 _require_scratch
 _require_attrs
 
-rm -f $here/$seqres.full
+rm -f $seqres.full
 
 echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
     || _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i paths=1 >>$here/$seqres.full 2>&1 \
+_scratch_mkfs_xfs -i paths=1 >>$seqres.full 2>&1 \
     || _notrun "i_paths not supported"
 
 echo "mount"
-_scratch_mount >>$here/$seqres.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
     || _fail "mount failed: $MOUNT_OPTIONS"
 
 # real QA test starts here
tests/xfs/168 +1 -1
index 4ca2869..901125a 100755
@@ -107,7 +107,7 @@ wait
 # dmapi destroy events are asyncronous,  don't rely on fixed ordering of events
 # in print_event output, use sort.
 echo "# here comes the dmapi print_event filtered and sorted output"
-cat $tmp.print_event_out | tee -a $here/$seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
+cat $tmp.print_event_out | tee -a $seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
 rm $tmp.print_event_out
 
 status=0
tests/xfs/186 +2 -2
index 44edaf7..8df91b6 100755
@@ -78,7 +78,7 @@ _rmv_eas()
 
 _filter_inode()
 {
-	tee -a $here/$seqres.full | \
+	tee -a $seqres.full | \
 		sed -e "s/core.forkoff/forkoff/g" | \
 		egrep '^u.sfdir2|^a.sfattr|forkoff' | \
 		egrep -v 'inumber|parent'
@@ -86,7 +86,7 @@ _filter_inode()
 
 _filter_version()
 {
-	tee -a $here/$seqres.full | tr ',' '\n' | grep ATTR
+	tee -a $seqres.full | tr ',' '\n' | grep ATTR
 }
 
 _print_inode()
tests/xfs/282 +2 -2
index 8ddb258..15ccc3f 100755
@@ -46,13 +46,13 @@ _require_legacy_v2_format
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 0 dump, format 2"
 _do_dump_file -f $tmp.l0 -K
 
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 1 dump, current format"
 _do_dump_file -l 1 -f $tmp.l1
tests/xfs/283 +2 -2
index cd9609e..def2107 100755
@@ -46,13 +46,13 @@ _require_legacy_v2_format
 _create_dumpdir_fill
 # ensure file/dir timestamps precede dump timestamp
 sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 0 dump, current format"
 _do_dump_file -f $tmp.l0
 
 _append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seqres.full
+src/bstat $SCRATCH_MNT >>$seqres.full
 
 echo "*** Level 1 dump, format 2"
 _do_dump_file -l 1 -f $tmp.l1 -K
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#51 lore raw

PATCH 23/25 xfstests: Decomplicate quota setup in 050

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

Only test 050 uses the _qsetup function, and it only uses the ID part of it in the test. the attempts to link output files is useless as there are no different output files used by the test.

Hence kill the _qsetup function, and move the code into test 050, simplifying it down to the minimum needed.

---
 common/quota  |   47 +----------------------------------------------
 tests/xfs/050 |   36 +++++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 55 deletions(-)
common/quota +1 -46
index 7f349ab..fd5374f 100644
@@ -92,7 +92,7 @@ _require_nobody()
 #
 _file_as_id()
 {
-    [ $# != 5 ] && _notrun "broken call to _file_as_id in test $seq"
+    [ $# != 5 ] && _fail "broken call to _file_as_id in test $seq"
 
     parent=`dirname $1`
     if [ $3 = p ]; then
@@ -157,51 +157,6 @@ _qmount()
     chmod ugo+rwx $SCRATCH_MNT
 }
 
-_qsetup()
-{
-    # setup exactly what it is we'll be testing
-    enforce=1
-    if src/feature -u $SCRATCH_DEV
-    then
-	type=u ;
-	eval `_choose_uid`
-	[ ! -f $seq.out ] && ln -s $seq.usrquota $seq.out
-    elif src/feature -g $SCRATCH_DEV
-    then
-	type=g
-	eval `_choose_gid`
-	[ ! -f $seq.out ] && ln -s $seq.grpquota $seq.out
-    elif src/feature -p $SCRATCH_DEV
-    then
-	type=p
-	eval `_choose_prid`
-	[ ! -f $seq.out ] && ln -s $seq.prjquota $seq.out
-    elif src/feature -U $SCRATCH_DEV
-    then
-	type=u
-	eval `_choose_uid`
-	[ ! -f $seq.out ] && ln -s $seq.uqnoenforce $seq.out
-	enforce=0
-    elif src/feature -G $SCRATCH_DEV
-    then
-	type=g
-	eval `_choose_gid`
-	[ ! -f $seq.out ] && ln -s $seq.gqnoenforce $seq.out
-	enforce=0
-    elif src/feature -P $SCRATCH_DEV
-    then
-	type=p
-	eval `_choose_prid`
-	[ ! -f $seq.out ] && ln -s $seq.pqnoenforce $seq.out
-	enforce=0
-    else
-	_notrun "No quota support at mount time"
-    fi
-
-    echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
-    echo "and using type=$type id=$id" >>$seqres.full
-}
-
 #
 # Ensures only the given quota mount option is used
 #
tests/xfs/050 +27 -9
index 774ed28..e2009a8 100755
@@ -98,6 +98,25 @@ _filter_and_check_blks()
 	' | _filter_report
 }
 
+_qsetup()
+{
+	opt=$1
+	enforce=0
+	if [ $opt = "u" -o $opt = "uno" ]; then
+		type=u
+		eval `_choose_uid`
+	elif [ $opt = "g" -o $opt = "gno" ]; then
+		type=g
+		eval `_choose_gid`
+	elif [ $opt = "p" -o $opt = "pno" ]; then
+		type=p
+		eval `_choose_prid`
+	fi
+	[ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
+
+	echo "Using type=$type id=$id" >> $seqres.full
+}
+
 _exercise()
 {
 	_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
@@ -116,10 +135,9 @@ _exercise()
 	[ $extsize -ge 512000 ] && \
 		_notrun "Extent size hint is too large ($extsize bytes)"
 
-	_qsetup
+	_qsetup $1
 
-	echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
-	echo "and using type=$type id=$id" >>$seqres.full
+	echo "Using type=$type id=$id" >>$seqres.full
 
 	echo
 	echo "*** report no quota settings" | tee -a $seqres.full
@@ -204,11 +222,11 @@ then
 else
 	_qmount_option "uquota"
 fi
-_exercise
+_exercise u
 
 echo "*** group"
 _qmount_option "gquota"
-_exercise
+_exercise g
 
 echo "*** uqnoenforce"
 if [ "$HOSTOS" == "IRIX" ]
@@ -217,19 +235,19 @@ then
 else
 	_qmount_option "uqnoenforce"
 fi
-_exercise
+_exercise uno
 
 echo "*** gqnoenforce"
 _qmount_option "gqnoenforce"
-_exercise
+_exercise gno
 
 echo "*** pquota"
 _qmount_option "pquota"
-_exercise
+_exercise p
 
 echo "*** pqnoenforce"
 _qmount_option "pqnoenforce"
-_exercise
+_exercise pno
 
 # success, all done
 status=0
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 23/25
#52 lore raw

Re: [PATCH 23/25] xfstests: Decomplicate quota setup in 050

Looks OK.

Quoted 168 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Only test 050 uses the _qsetup function, and it only uses the ID part of it in the test. the attempts to link output files is useless as there are no different output files used by the test.

Hence kill the _qsetup function, and move the code into test 050, simplifying it down to the minimum needed.

---
 common/quota  |   47 +----------------------------------------------
 tests/xfs/050 |   36 +++++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 55 deletions(-)
common/quota +1 -46
index 7f349ab..fd5374f 100644
@@ -92,7 +92,7 @@ _require_nobody()
 #
 _file_as_id()
 {
-    [ $# != 5 ] && _notrun "broken call to _file_as_id in test $seq"
+    [ $# != 5 ] && _fail "broken call to _file_as_id in test $seq"
 
     parent=`dirname $1`
     if [ $3 = p ]; then
@@ -157,51 +157,6 @@ _qmount()
     chmod ugo+rwx $SCRATCH_MNT
 }
 
-_qsetup()
-{
-    # setup exactly what it is we'll be testing
-    enforce=1
-    if src/feature -u $SCRATCH_DEV
-    then
-	type=u ;
-	eval `_choose_uid`
-	[ ! -f $seq.out ] && ln -s $seq.usrquota $seq.out
-    elif src/feature -g $SCRATCH_DEV
-    then
-	type=g
-	eval `_choose_gid`
-	[ ! -f $seq.out ] && ln -s $seq.grpquota $seq.out
-    elif src/feature -p $SCRATCH_DEV
-    then
-	type=p
-	eval `_choose_prid`
-	[ ! -f $seq.out ] && ln -s $seq.prjquota $seq.out
-    elif src/feature -U $SCRATCH_DEV
-    then
-	type=u
-	eval `_choose_uid`
-	[ ! -f $seq.out ] && ln -s $seq.uqnoenforce $seq.out
-	enforce=0
-    elif src/feature -G $SCRATCH_DEV
-    then
-	type=g
-	eval `_choose_gid`
-	[ ! -f $seq.out ] && ln -s $seq.gqnoenforce $seq.out
-	enforce=0
-    elif src/feature -P $SCRATCH_DEV
-    then
-	type=p
-	eval `_choose_prid`
-	[ ! -f $seq.out ] && ln -s $seq.pqnoenforce $seq.out
-	enforce=0
-    else
-	_notrun "No quota support at mount time"
-    fi
-
-    echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
-    echo "and using type=$type id=$id" >>$seqres.full
-}
-
 #
 # Ensures only the given quota mount option is used
 #
tests/xfs/050 +27 -9
index 774ed28..e2009a8 100755
@@ -98,6 +98,25 @@ _filter_and_check_blks()
 	' | _filter_report
 }
 
+_qsetup()
+{
+	opt=$1
+	enforce=0
+	if [ $opt = "u" -o $opt = "uno" ]; then
+		type=u
+		eval `_choose_uid`
+	elif [ $opt = "g" -o $opt = "gno" ]; then
+		type=g
+		eval `_choose_gid`
+	elif [ $opt = "p" -o $opt = "pno" ]; then
+		type=p
+		eval `_choose_prid`
+	fi
+	[ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
+
+	echo "Using type=$type id=$id" >> $seqres.full
+}
+
 _exercise()
 {
 	_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
@@ -116,10 +135,9 @@ _exercise()
 	[ $extsize -ge 512000 ] && \
 		_notrun "Extent size hint is too large ($extsize bytes)"
 
-	_qsetup
+	_qsetup $1
 
-	echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
-	echo "and using type=$type id=$id" >>$seqres.full
+	echo "Using type=$type id=$id" >>$seqres.full
 
 	echo
 	echo "*** report no quota settings" | tee -a $seqres.full
@@ -204,11 +222,11 @@ then
 else
 	_qmount_option "uquota"
 fi
-_exercise
+_exercise u
 
 echo "*** group"
 _qmount_option "gquota"
-_exercise
+_exercise g
 
 echo "*** uqnoenforce"
 if [ "$HOSTOS" == "IRIX" ]
@@ -217,19 +235,19 @@ then
 else
 	_qmount_option "uqnoenforce"
 fi
-_exercise
+_exercise uno
 
 echo "*** gqnoenforce"
 _qmount_option "gqnoenforce"
-_exercise
+_exercise gno
 
 echo "*** pquota"
 _qmount_option "pquota"
-_exercise
+_exercise p
 
 echo "*** pqnoenforce"
 _qmount_option "pqnoenforce"
-_exercise
+_exercise pno
 
 # success, all done
 status=0
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#53 lore raw

PATCH 24/25 xfstests: clean up test 262 output file use.

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

Test 262 uses ${} notation for some variables, and so is resistant to grep and sed matches. Change it to use the same notation as the rest of xfstests and fix up the output file redirections made in previous patches.

---
 tests/xfs/262 |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
tests/xfs/262 +18 -18
index 01f7f8b..0c15787 100755
@@ -28,15 +28,15 @@
 
 seq=$(basename $0)
 seqres=$RESULT_DIR/$seq
-echo "QA output created by ${seq}"
+echo "QA output created by $seq"
 
 here=$(pwd)
 
-cp /dev/null "${seq}.full"
+rm -f $seqres.full
 
 tmp=/tmp/$$
-my_projects=${tmp}.projects
-my_projid=${tmp}.projid
+my_projects=$tmp.projects
+my_projid=$tmp.projid
 proj_name=test_project
 proj_num=1
 
@@ -48,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _cleanup()
 {
     cd /
-    rm -f ${tmp}.*
+    rm -f $tmp.*
 }
 
 # get standard environment, filters and checks
@@ -60,7 +60,7 @@ echo "Silence is golden."
 
 # real QA test starts here
 
-proj_dir="${SCRATCH_MNT}/test"
+proj_dir="$SCRATCH_MNT/test"
 
 # Modify as appropriate.
 _supported_fs xfs
@@ -108,38 +108,38 @@ _filter_quota_rpt() {
 }
 
 _quota_cmd() {
-	xfs_quota -P "${my_projid}" -D "${my_projects}" -x \
-		-c "$@" "${SCRATCH_MNT}"
+	xfs_quota -P "$my_projid" -D "$my_projects" -x \
+		-c "$@" "$SCRATCH_MNT"
 }
 
 # Set up--mount scratch and create the project directory
 
-echo ${proj_name}:${proj_num} > "${my_projid}"
-echo ${proj_num}:${proj_dir} > "${my_projects}"
+echo $proj_name:$proj_num > "$my_projid"
+echo $proj_num:$proj_dir > "$my_projects"
 
-_scratch_mkfs						>> "${seq}.full" 2>&1
+_scratch_mkfs						>> "$seqres.full" 2>&1
 
 export MOUNT_OPTIONS="-opquota"
 _qmount
 mkdir -p "${proj_dir}"
 
 # Setup the project quota directory
-_quota_cmd "project -s ${proj_name}"			>> "${seq}.full" 2>&1
+_quota_cmd "project -s ${proj_name}"			>> "$seqres.full" 2>&1
 
 # Assign block quota limits
 _quota_cmd "limit -p bhard=${qlimit_meg}m bsoft=${qlimit_meg}m ${proj_name}" \
-							2>> "${seq}.full" 1>&2
+							2>> "$seqres.full" 1>&2
 
 # See what gets reported
-_quota_cmd "report"		| _filter_quota_rpt	2>> "${seq}.full"
-_quota_cmd "df"			| _filter_quota_rpt	2>> "${seq}.full"
+_quota_cmd "report"		| _filter_quota_rpt	2>> "$seqres.full"
+_quota_cmd "df"			| _filter_quota_rpt	2>> "$seqres.full"
 
 # This time using "human readable" output
-_quota_cmd "report -h"		| _filter_quota_rpt	2>> "${seq}.full"
-_quota_cmd "df -h"		| _filter_quota_rpt	2>> "${seq}.full"
+_quota_cmd "report -h"		| _filter_quota_rpt	2>> "$seqres.full"
+_quota_cmd "df -h"		| _filter_quota_rpt	2>> "$seqres.full"
 
 # Clean up
-rm -rf "${proj_dir}"
+rm -rf "$proj_dir"
 _scratch_unmount
 
 status=0	# success, all done
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 24/25
#54 lore raw

Re: [PATCH 24/25] xfstests: clean up test 262 output file use.

Looks OK.

Quoted 112 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Test 262 uses ${} notation for some variables, and so is resistant to grep and sed matches. Change it to use the same notation as the rest of xfstests and fix up the output file redirections made in previous patches.

---
 tests/xfs/262 |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
tests/xfs/262 +18 -18
index 01f7f8b..0c15787 100755
@@ -28,15 +28,15 @@
 
 seq=$(basename $0)
 seqres=$RESULT_DIR/$seq
-echo "QA output created by ${seq}"
+echo "QA output created by $seq"
 
 here=$(pwd)
 
-cp /dev/null "${seq}.full"
+rm -f $seqres.full
 
 tmp=/tmp/$$
-my_projects=${tmp}.projects
-my_projid=${tmp}.projid
+my_projects=$tmp.projects
+my_projid=$tmp.projid
 proj_name=test_project
 proj_num=1
 
@@ -48,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _cleanup()
 {
     cd /
-    rm -f ${tmp}.*
+    rm -f $tmp.*
 }
 
 # get standard environment, filters and checks
@@ -60,7 +60,7 @@ echo "Silence is golden."
 
 # real QA test starts here
 
-proj_dir="${SCRATCH_MNT}/test"
+proj_dir="$SCRATCH_MNT/test"
 
 # Modify as appropriate.
 _supported_fs xfs
@@ -108,38 +108,38 @@ _filter_quota_rpt() {
 }
 
 _quota_cmd() {
-	xfs_quota -P "${my_projid}" -D "${my_projects}" -x \
-		-c "$@" "${SCRATCH_MNT}"
+	xfs_quota -P "$my_projid" -D "$my_projects" -x \
+		-c "$@" "$SCRATCH_MNT"
 }
 
 # Set up--mount scratch and create the project directory
 
-echo ${proj_name}:${proj_num} > "${my_projid}"
-echo ${proj_num}:${proj_dir} > "${my_projects}"
+echo $proj_name:$proj_num > "$my_projid"
+echo $proj_num:$proj_dir > "$my_projects"
 
-_scratch_mkfs						>> "${seq}.full" 2>&1
+_scratch_mkfs						>> "$seqres.full" 2>&1
 
 export MOUNT_OPTIONS="-opquota"
 _qmount
 mkdir -p "${proj_dir}"
 
 # Setup the project quota directory
-_quota_cmd "project -s ${proj_name}"			>> "${seq}.full" 2>&1
+_quota_cmd "project -s ${proj_name}"			>> "$seqres.full" 2>&1
 
 # Assign block quota limits
 _quota_cmd "limit -p bhard=${qlimit_meg}m bsoft=${qlimit_meg}m ${proj_name}" \
-							2>> "${seq}.full" 1>&2
+							2>> "$seqres.full" 1>&2
 
 # See what gets reported
-_quota_cmd "report"		| _filter_quota_rpt	2>> "${seq}.full"
-_quota_cmd "df"			| _filter_quota_rpt	2>> "${seq}.full"
+_quota_cmd "report"		| _filter_quota_rpt	2>> "$seqres.full"
+_quota_cmd "df"			| _filter_quota_rpt	2>> "$seqres.full"
 
 # This time using "human readable" output
-_quota_cmd "report -h"		| _filter_quota_rpt	2>> "${seq}.full"
-_quota_cmd "df -h"		| _filter_quota_rpt	2>> "${seq}.full"
+_quota_cmd "report -h"		| _filter_quota_rpt	2>> "$seqres.full"
+_quota_cmd "df -h"		| _filter_quota_rpt	2>> "$seqres.full"
 
 # Clean up
-rm -rf "${proj_dir}"
+rm -rf "$proj_dir"
 _scratch_unmount
 
 status=0	# success, all done
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#55 lore raw

PATCH 25/25 xfstests: use _notrun for tape checks

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

_require_tape is failing tests when no TAPE_DEV is specified. It should be using _notrun for these cases rather than trying to open code the $seqres.notrun magic file manipulations.

---
 common/dump |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
common/dump +3 -10
index 3df6191..5d4d2ae 100644
@@ -139,9 +139,7 @@ _check_onl()
 	echo "ERROR: mt -f $dumptape failed"
 	cat $tmp.status
 
-	echo "mt -f $dumptape failed" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "mt -f $dumptape failed"
     fi
 
 
@@ -151,9 +149,7 @@ _check_onl()
 	echo "ERROR: $dumptape is not online"
 	cat $tmp.status
 
-	echo "dumptape, $dumptape, is not online" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "dumptape, $dumptape, is not online"
     fi
 }
 
@@ -229,10 +225,7 @@ _require_tape()
     dumptape=$1
 
     if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
-        echo "This test requires a dump tape - none was specified"
-	echo "No dump tape specified" >$seqres.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "No dump tape specified"
     fi
 
     _check_onl
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 25/25
#56 lore raw

Re: [PATCH 25/25] xfstests: use _notrun for tape checks

Looks OK.

Quoted 56 lines · Dave Chinner

From: Dave Chinner <[email protected]>

_require_tape is failing tests when no TAPE_DEV is specified. It should be using _notrun for these cases rather than trying to open code the $seqres.notrun magic file manipulations.

---
 common/dump |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
common/dump +3 -10
index 3df6191..5d4d2ae 100644
@@ -139,9 +139,7 @@ _check_onl()
 	echo "ERROR: mt -f $dumptape failed"
 	cat $tmp.status
 
-	echo "mt -f $dumptape failed" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "mt -f $dumptape failed"
     fi
 
 
@@ -151,9 +149,7 @@ _check_onl()
 	echo "ERROR: $dumptape is not online"
 	cat $tmp.status
 
-	echo "dumptape, $dumptape, is not online" >$seq.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "dumptape, $dumptape, is not online"
     fi
 }
 
@@ -229,10 +225,7 @@ _require_tape()
     dumptape=$1
 
     if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
-        echo "This test requires a dump tape - none was specified"
-	echo "No dump tape specified" >$seqres.notrun
-	status=$NOTRUNSTS
-	exit
+	_notrun "No dump tape specified"
     fi
 
     _check_onl
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs