xfstests: introduce a common directory

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

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Phil White <pwhite@sgi.com>
[rjohnston@sgi.com reworked for TOT changes]
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

106 files changed, 230 insertions, 230 deletions

diff --git a/tests/generic/001 b/tests/generic/001
index 4e8b1144..c7d9e5fa 100755
--- a/tests/generic/001
+++ b/tests/generic/001
@@ -38,8 +38,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`
diff --git a/tests/generic/002 b/tests/generic/002
index b9fd8886..19b6871e 100755
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -29,8 +29,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`
diff --git a/tests/generic/005 b/tests/generic/005
index 42c4f0be..8bfb94f9 100755
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -64,8 +64,8 @@ _touch()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/006 b/tests/generic/006
index 252ed5bf..e12234c6 100755
--- a/tests/generic/006
+++ b/tests/generic/006
@@ -51,8 +51,8 @@ _count()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/007 b/tests/generic/007
index bc9148e2..e72ddd1b 100755
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -45,8 +45,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/010 b/tests/generic/010
index 18f2eaa3..61f7a3ce 100755
--- a/tests/generic/010
+++ b/tests/generic/010
@@ -51,8 +51,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"
 
diff --git a/tests/generic/011 b/tests/generic/011
index 731500fa..42c5f62d 100755
--- a/tests/generic/011
+++ b/tests/generic/011
@@ -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
diff --git a/tests/generic/013 b/tests/generic/013
index 641a9dc7..71caa2f6 100755
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -53,8 +53,8 @@ _filesize()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/014 b/tests/generic/014
index 8205efcf..21b6e16a 100755
--- a/tests/generic/014
+++ b/tests/generic/014
@@ -42,8 +42,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os IRIX Linux
diff --git a/tests/generic/015 b/tests/generic/015
index b87144f3..44e5d99f 100755
--- a/tests/generic/015
+++ b/tests/generic/015
@@ -33,8 +33,8 @@ tmp=/tmp/$$
 status=1	# success is the default!
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _cleanup()
 {
diff --git a/tests/generic/020 b/tests/generic/020
index 94695eb0..604e73b4 100755
--- a/tests/generic/020
+++ b/tests/generic/020
@@ -34,9 +34,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()
 {
diff --git a/tests/generic/053 b/tests/generic/053
index f5daddd5..b238e304 100755
--- a/tests/generic/053
+++ b/tests/generic/053
@@ -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.attr
+. ./common/rc
+. ./common/filter
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/062 b/tests/generic/062
index dde4baf7..3826c179 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -34,9 +34,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()
 {
diff --git a/tests/generic/068 b/tests/generic/068
index 1a531a39..cd37c6c9 100755
--- a/tests/generic/068
+++ b/tests/generic/068
@@ -48,8 +48,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
diff --git a/tests/generic/069 b/tests/generic/069
index f16bdc8e..6924b7e5 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -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.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/070 b/tests/generic/070
index 120c4d96..eece69fd 100755
--- a/tests/generic/070
+++ b/tests/generic/070
@@ -41,9 +41,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
diff --git a/tests/generic/074 b/tests/generic/074
index ce6cc202..dd0497fb 100755
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/075 b/tests/generic/075
index 7d7a211f..2d3d3ea8 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/076 b/tests/generic/076
index ed012e79..31ca347b 100755
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -50,8 +50,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
diff --git a/tests/generic/077 b/tests/generic/077
index f7f1eb8d..87c31805 100755
--- a/tests/generic/077
+++ b/tests/generic/077
@@ -43,9 +43,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
diff --git a/tests/generic/079 b/tests/generic/079
index 9700879b..5763a631 100755
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -43,9 +43,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
diff --git a/tests/generic/083 b/tests/generic/083
index d7f58f78..1bc70f10 100755
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -51,8 +51,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
diff --git a/tests/generic/088 b/tests/generic/088
index 9d033381..285ec9f6 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -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
 
 _filter()
 {
diff --git a/tests/generic/089 b/tests/generic/089
index f3e77fe2..83d050d6 100755
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -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
 
 addentries()
 {
diff --git a/tests/generic/091 b/tests/generic/091
index 41076566..1ba7858d 100755
--- a/tests/generic/091
+++ b/tests/generic/091
@@ -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
diff --git a/tests/generic/093 b/tests/generic/093
index 123ea7dc..bd45d627 100755
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -37,9 +37,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()
 {
diff --git a/tests/generic/097 b/tests/generic/097
index 102c558e..27804f58 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -61,8 +61,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.
diff --git a/tests/generic/099 b/tests/generic/099
index 8a21277a..83ddd9f9 100755
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -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
 
 runas=$here/src/runas
 
diff --git a/tests/generic/100 b/tests/generic/100
index a9d0a76b..8152fc1e 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -35,8 +35,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()
 {
@@ -47,7 +47,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
diff --git a/tests/generic/105 b/tests/generic/105
index 09a47df3..69ec933d 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -42,9 +42,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
diff --git a/tests/generic/112 b/tests/generic/112
index 6ffefe5f..e8852ab1 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/113 b/tests/generic/113
index 4a4bf204..68322c9a 100755
--- a/tests/generic/113
+++ b/tests/generic/113
@@ -41,8 +41,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _do_test()
 {
diff --git a/tests/generic/117 b/tests/generic/117
index 7f8563d8..8f43e6c6 100755
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -73,9 +73,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
diff --git a/tests/generic/120 b/tests/generic/120
index afc2408f..ad909d2d 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -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
diff --git a/tests/generic/123 b/tests/generic/123
index df0a3470..a7601a33 100755
--- a/tests/generic/123
+++ b/tests/generic/123
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/124 b/tests/generic/124
index 7babdd3e..455b555e 100755
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -44,8 +44,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/125 b/tests/generic/125
index c606f290..f818b573 100755
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -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
diff --git a/tests/generic/126 b/tests/generic/126
index 5bad7d15..3e1ef6f6 100755
--- a/tests/generic/126
+++ b/tests/generic/126
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/127 b/tests/generic/127
index b9098a1d..bf4539e7 100755
--- a/tests/generic/127
+++ b/tests/generic/127
@@ -44,8 +44,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"
diff --git a/tests/generic/128 b/tests/generic/128
index 2cb414c8..f78fd179 100755
--- a/tests/generic/128
+++ b/tests/generic/128
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/129 b/tests/generic/129
index 9d1440ee..9efb2c78 100755
--- a/tests/generic/129
+++ b/tests/generic/129
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 echo_and_run()
 {
diff --git a/tests/generic/130 b/tests/generic/130
index ebdbb713..5b0a0613 100755
--- a/tests/generic/130
+++ b/tests/generic/130
@@ -49,8 +49,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/131 b/tests/generic/131
index a2602c21..66ffc891 100755
--- a/tests/generic/131
+++ b/tests/generic/131
@@ -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
diff --git a/tests/generic/132 b/tests/generic/132
index 002b3305..b855661a 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -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
diff --git a/tests/generic/133 b/tests/generic/133
index be6244b8..e1d59299 100755
--- a/tests/generic/133
+++ b/tests/generic/133
@@ -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
diff --git a/tests/generic/135 b/tests/generic/135
index 3bb05e38..0e5a2e21 100755
--- a/tests/generic/135
+++ b/tests/generic/135
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/141 b/tests/generic/141
index 7df988f5..a91946c3 100755
--- a/tests/generic/141
+++ b/tests/generic/141
@@ -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
diff --git a/tests/generic/169 b/tests/generic/169
index 99cf5473..6c7f8d32 100755
--- a/tests/generic/169
+++ b/tests/generic/169
@@ -50,8 +50,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
diff --git a/tests/generic/184 b/tests/generic/184
index 56efc3c3..d551c117 100755
--- a/tests/generic/184
+++ b/tests/generic/184
@@ -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
diff --git a/tests/generic/192 b/tests/generic/192
index 321a92f0..3247ebd1 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -41,8 +41,8 @@ _access_time()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/193 b/tests/generic/193
index 48deac71..da61a18d 100755
--- a/tests/generic/193
+++ b/tests/generic/193
@@ -60,8 +60,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
diff --git a/tests/generic/198 b/tests/generic/198
index b2d4cbaf..f683ff1e 100755
--- a/tests/generic/198
+++ b/tests/generic/198
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/204 b/tests/generic/204
index baf45ef6..37cb427d 100755
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -32,8 +32,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
diff --git a/tests/generic/207 b/tests/generic/207
index faef4a45..86c81df4 100755
--- a/tests/generic/207
+++ b/tests/generic/207
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/208 b/tests/generic/208
index 437547c4..fd9b6d9d 100755
--- a/tests/generic/208
+++ b/tests/generic/208
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/209 b/tests/generic/209
index dc9c47e9..08be5469 100755
--- a/tests/generic/209
+++ b/tests/generic/209
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/210 b/tests/generic/210
index f4f997a7..e85fd48a 100755
--- a/tests/generic/210
+++ b/tests/generic/210
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/211 b/tests/generic/211
index 193cd0da..fa2a60a3 100755
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/212 b/tests/generic/212
index 2f46c09a..94e25888 100755
--- a/tests/generic/212
+++ b/tests/generic/212
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/213 b/tests/generic/213
index 40829c3f..c3adba0a 100755
--- a/tests/generic/213
+++ b/tests/generic/213
@@ -43,8 +43,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
diff --git a/tests/generic/214 b/tests/generic/214
index d26d0774..e1dcc6f2 100755
--- a/tests/generic/214
+++ b/tests/generic/214
@@ -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
diff --git a/tests/generic/215 b/tests/generic/215
index f03af0df..6894f835 100755
--- a/tests/generic/215
+++ b/tests/generic/215
@@ -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
 _supported_fs generic
diff --git a/tests/generic/219 b/tests/generic/219
index d9420986..22d3c040 100755
--- a/tests/generic/219
+++ b/tests/generic/219
@@ -37,9 +37,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
diff --git a/tests/generic/221 b/tests/generic/221
index f554fe3a..8f142f24 100755
--- a/tests/generic/221
+++ b/tests/generic/221
@@ -36,7 +36,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
diff --git a/tests/generic/223 b/tests/generic/223
index 8c833873..aca9c3df 100755
--- a/tests/generic/223
+++ b/tests/generic/223
@@ -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 generic
diff --git a/tests/generic/224 b/tests/generic/224
index c59b6b9e..ef9704f0 100755
--- a/tests/generic/224
+++ b/tests/generic/224
@@ -46,8 +46,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
diff --git a/tests/generic/225 b/tests/generic/225
index 31d02040..47b0fcd6 100755
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/226 b/tests/generic/226
index 5111c9a7..ac5125ae 100755
--- a/tests/generic/226
+++ b/tests/generic/226
@@ -34,7 +34,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
diff --git a/tests/generic/228 b/tests/generic/228
index f58982df..0bf0f0fe 100755
--- a/tests/generic/228
+++ b/tests/generic/228
@@ -42,7 +42,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
diff --git a/tests/generic/230 b/tests/generic/230
index 005af429..b02e8e96 100755
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -37,9 +37,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
diff --git a/tests/generic/231 b/tests/generic/231
index 2719ad74..73de5071 100755
--- a/tests/generic/231
+++ b/tests/generic/231
@@ -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
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -N 20000"
diff --git a/tests/generic/232 b/tests/generic/232
index 53e023fc..ca363769 100755
--- a/tests/generic/232
+++ b/tests/generic/232
@@ -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
 
 _filter_num()
 {
diff --git a/tests/generic/233 b/tests/generic/233
index 40b3f5d6..21748a66 100755
--- a/tests/generic/233
+++ b/tests/generic/233
@@ -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.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
diff --git a/tests/generic/234 b/tests/generic/234
index 8bd19e40..e9184327 100755
--- a/tests/generic/234
+++ b/tests/generic/234
@@ -37,9 +37,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()
 {
diff --git a/tests/generic/235 b/tests/generic/235
index 5560fa6d..e5228103 100755
--- a/tests/generic/235
+++ b/tests/generic/235
@@ -37,9 +37,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
diff --git a/tests/generic/236 b/tests/generic/236
index 831afc74..ecc87865 100755
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -39,7 +39,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
diff --git a/tests/generic/237 b/tests/generic/237
index 171d96c9..bd0ecf0f 100755
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -36,9 +36,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()
 {
diff --git a/tests/generic/239 b/tests/generic/239
index aae4f7ec..df8a02cd 100755
--- a/tests/generic/239
+++ b/tests/generic/239
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/240 b/tests/generic/240
index 9b6982f0..55e795f9 100755
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -46,8 +46,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/241 b/tests/generic/241
index 297ae020..3dbd9d14 100755
--- a/tests/generic/241
+++ b/tests/generic/241
@@ -39,8 +39,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 _supported_fs generic
 _supported_os Linux
diff --git a/tests/generic/245 b/tests/generic/245
index ec81c4ce..e82fbb9f 100755
--- a/tests/generic/245
+++ b/tests/generic/245
@@ -35,8 +35,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
diff --git a/tests/generic/246 b/tests/generic/246
index 68c8c27f..ed2a080d 100755
--- a/tests/generic/246
+++ b/tests/generic/246
@@ -36,8 +36,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
diff --git a/tests/generic/247 b/tests/generic/247
index 31b94a9c..227b0c0a 100755
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/248 b/tests/generic/248
index 3f68146c..7ae04814 100755
--- a/tests/generic/248
+++ b/tests/generic/248
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/249 b/tests/generic/249
index 32f82e35..0319ef84 100755
--- a/tests/generic/249
+++ b/tests/generic/249
@@ -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
diff --git a/tests/generic/251 b/tests/generic/251
index c91e67f7..895367b5 100755
--- a/tests/generic/251
+++ b/tests/generic/251
@@ -39,8 +39,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
diff --git a/tests/generic/255 b/tests/generic/255
index 181f87e7..0c599346 100755
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -40,9 +40,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 
diff --git a/tests/generic/256 b/tests/generic/256
index 384bd3c1..bc5c3241 100755
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -40,9 +40,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
diff --git a/tests/generic/257 b/tests/generic/257
index d341063c..e12fed8d 100755
--- a/tests/generic/257
+++ b/tests/generic/257
@@ -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
diff --git a/tests/generic/258 b/tests/generic/258
index b8fe984e..18685703 100755
--- a/tests/generic/258
+++ b/tests/generic/258
@@ -42,7 +42,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
diff --git a/tests/generic/260 b/tests/generic/260
index e5141283..425cf86f 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -36,8 +36,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
diff --git a/tests/generic/263 b/tests/generic/263
index 56f4ae39..c8af9f4d 100755
--- a/tests/generic/263
+++ b/tests/generic/263
@@ -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
diff --git a/tests/generic/269 b/tests/generic/269
index 7b387b2d..47f5b2a7 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -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
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
 _workout()
diff --git a/tests/generic/270 b/tests/generic/270
index 8ca8aa2a..d7d9e309 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -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
 
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
diff --git a/tests/generic/273 b/tests/generic/273
index 63e64b15..9b79a710 100755
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -41,8 +41,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 threads=50
 count=2
diff --git a/tests/generic/274 b/tests/generic/274
index 00f869df..022b0c4a 100755
--- a/tests/generic/274
+++ b/tests/generic/274
@@ -43,8 +43,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/275 b/tests/generic/275
index 2d726fad..b280217d 100755
--- a/tests/generic/275
+++ b/tests/generic/275
@@ -41,8 +41,8 @@ _cleanup()
 	_scratch_unmount
 }
 
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/277 b/tests/generic/277
index 2118104d..4e8c025d 100755
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -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
diff --git a/tests/generic/280 b/tests/generic/280
index 27d5a20f..e804e6dc 100755
--- a/tests/generic/280
+++ b/tests/generic/280
@@ -40,9 +40,9 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.quota
+. ./common/rc
+. ./common/filter
+. ./common/quota
 
 _require_scratch
 _require_quota
diff --git a/tests/generic/285 b/tests/generic/285
index 71bd688b..fab6bf45 100644
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -36,8 +36,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
diff --git a/tests/generic/286 b/tests/generic/286
index d2acd0fa..70728eae 100644
--- a/tests/generic/286
+++ b/tests/generic/286
@@ -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
 
 # real QA test starts here
 _supported_fs generic
diff --git a/tests/generic/288 b/tests/generic/288
index b8bea876..6ca0ca78 100644
--- a/tests/generic/288
+++ b/tests/generic/288
@@ -32,8 +32,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
diff --git a/tests/generic/294 b/tests/generic/294
index 618e8a40..9a5ff13b 100644
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -40,8 +40,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/generic/299 b/tests/generic/299
index dba92129..71a11919 100644
--- a/tests/generic/299
+++ b/tests/generic/299
@@ -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 generic
diff --git a/tests/generic/300 b/tests/generic/300
index efd7ec84..4612dc28 100644
--- a/tests/generic/300
+++ b/tests/generic/300
@@ -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 generic
diff --git a/tests/generic/306 b/tests/generic/306
index 72e32caa..35fb5ef9 100644
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -37,8 +37,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here