[PATCH 00/12] run more generic tests on TEST_DIR

[PATCH 00/12] run more generic tests on TEST_DIR

[Christoph Hellwig]

As Stanislav pointed out previously various tests worked fine on NFS
when it still defined a scratch dir that we abused for the test dir.

This series makes various tests that don't require specific file system
sizes or parameters run on TEST_DIR instead of using the scratch devices.

This also allow to remove various bits of boilerplat code as the TEST_DIR
is always available, and checked after each test.

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

[PATCH 01/12] 062: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0001-062-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 32469 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/062     |   95 ++++++------
 tests/generic/062.out |  384 ++++++++++++++++++++++++-------------------------
 2 files changed, 239 insertions(+), 240 deletions(-)

diff --git a/tests/generic/062 b/tests/generic/062
index 047c930..fa2fce0 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -40,47 +40,46 @@ _cleanup()
 {
         cd /
 	echo; echo "*** unmount"
-	umount $SCRATCH_MNT 2>/dev/null
 	rm -f $tmp.*
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 getfattr()
 {
-    $GETFATTR_PROG --absolute-names -dh $@ 2>&1 | _filter_scratch
+    $GETFATTR_PROG --absolute-names -dh $@ 2>&1 | _filter_test_dir
 }
 
 setfattr()
 {
-    $SETFATTR_PROG $@ 2>&1 | _filter_scratch
+    $SETFATTR_PROG $@ 2>&1 | _filter_test_dir
 }
 
 _create_test_bed()
 {
 	echo "*** create test bed"
-	touch $SCRATCH_MNT/reg
-	mkdir -p $SCRATCH_MNT/dir
-	ln -s $SCRATCH_MNT/dir $SCRATCH_MNT/lnk
-	mkdir $SCRATCH_MNT/dev
-	mknod $SCRATCH_MNT/dev/b b 0 0
-	mknod $SCRATCH_MNT/dev/c c 0 0
-	mknod $SCRATCH_MNT/dev/p p
+	touch $testdir/reg
+	mkdir -p $testdir/dir
+	ln -s $testdir/dir $testdir/lnk
+	mkdir $testdir/dev
+	mknod $testdir/dev/b b 0 0
+	mknod $testdir/dev/c c 0 0
+	mknod $testdir/dev/p p
 	# sanity check
-	find $SCRATCH_MNT | LC_COLLATE=POSIX sort | _filter_scratch | grep -v "lost+found"
+	find $testdir | LC_COLLATE=POSIX sort | _filter_test_dir | grep -v "lost+found"
 }
 
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
 
-_require_scratch
 _require_attrs
 
 rm -f $tmp.backup1 $tmp.backup2 $seqres.full
 
-# real QA test starts here
-_scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
-_scratch_mount || _fail "mount failed"
+testdir="$TEST_DIR/attr062"
+rm -rf $testdir
+mkdir $testdir
+
 _create_test_bed
 
 # In kernels before 3.0, getxattr() fails with EPERM for an attribute which
@@ -100,42 +99,42 @@ for nsp in $ATTR_MODES; do
 		echo; echo "=== TYPE $inode; NAMESPACE $nsp"; echo
 		echo "*** set/get one initially empty attribute"
     
-		setfattr -h -n $nsp.name $SCRATCH_MNT/$inode
-		getfattr -m $nsp $SCRATCH_MNT/$inode
+		setfattr -h -n $nsp.name $testdir/$inode
+		getfattr -m $nsp $testdir/$inode
 
 		echo "*** overwrite empty, set several new attributes"
-		setfattr -h -n $nsp.name -v 0xbabe $SCRATCH_MNT/$inode
-		setfattr -h -n $nsp.name2 -v 0xdeadbeef $SCRATCH_MNT/$inode
-		setfattr -h -n $nsp.name3 -v 0xdeface $SCRATCH_MNT/$inode
+		setfattr -h -n $nsp.name -v 0xbabe $testdir/$inode
+		setfattr -h -n $nsp.name2 -v 0xdeadbeef $testdir/$inode
+		setfattr -h -n $nsp.name3 -v 0xdeface $testdir/$inode
 
 		echo "*** fetch several attribute names and values (hex)"
-		getfattr -m $nsp -e hex $SCRATCH_MNT/$inode
+		getfattr -m $nsp -e hex $testdir/$inode
 
 		echo "*** fetch several attribute names and values (base64)"
-		getfattr -m $nsp -e base64 $SCRATCH_MNT/$inode
+		getfattr -m $nsp -e base64 $testdir/$inode
 		
 		echo "*** shrink value of an existing attribute"
-		setfattr -h -n $nsp.name2 -v 0xdeaf $SCRATCH_MNT/$inode
-		getfattr -m $nsp -e hex $SCRATCH_MNT/$inode
+		setfattr -h -n $nsp.name2 -v 0xdeaf $testdir/$inode
+		getfattr -m $nsp -e hex $testdir/$inode
 
 		echo "*** grow value of existing attribute"
-		setfattr -h -n $nsp.name2 -v 0xdecade $SCRATCH_MNT/$inode
-		getfattr -m $nsp -e hex $SCRATCH_MNT/$inode
+		setfattr -h -n $nsp.name2 -v 0xdecade $testdir/$inode
+		getfattr -m $nsp -e hex $testdir/$inode
 		
 		echo "*** set an empty value for second attribute"
-		setfattr -h -n $nsp.name2 $SCRATCH_MNT/$inode
-		getfattr -m $nsp -n $nsp.name2 $SCRATCH_MNT/$inode 2>&1 | invalid_attribute_filter
+		setfattr -h -n $nsp.name2 $testdir/$inode
+		getfattr -m $nsp -n $nsp.name2 $testdir/$inode 2>&1 | invalid_attribute_filter
 
 		echo "*** overwrite empty value"
-		setfattr -h -n $nsp.name2 -v 0xcafe $SCRATCH_MNT/$inode
-		getfattr -m $nsp -e hex -n $nsp.name2 $SCRATCH_MNT/$inode 2>&1 | invalid_attribute_filter
+		setfattr -h -n $nsp.name2 -v 0xcafe $testdir/$inode
+		getfattr -m $nsp -e hex -n $nsp.name2 $testdir/$inode 2>&1 | invalid_attribute_filter
 
 		echo "*** remove attribute"
-		setfattr -h -x $nsp.name2 $SCRATCH_MNT/$inode
-		getfattr -m $nsp -e hex -n $nsp.name2 $SCRATCH_MNT/$inode 2>&1 | invalid_attribute_filter
+		setfattr -h -x $nsp.name2 $testdir/$inode
+		getfattr -m $nsp -e hex -n $nsp.name2 $testdir/$inode 2>&1 | invalid_attribute_filter
 
 		echo "*** final list (strings, type=$inode, nsp=$nsp)"
-		getfattr -m '.' -e hex $SCRATCH_MNT/$inode
+		getfattr -m '.' -e hex $testdir/$inode
 	
 	done
 done
@@ -149,27 +148,27 @@ _extend_test_bed()
 {
 	echo "*** extend test bed"
 	# must set some descents' attributes to be useful
-	mkdir -p $SCRATCH_MNT/here/up/ascend
-	mkdir -p $SCRATCH_MNT/descend/down/here
-	find $SCRATCH_MNT/descend | xargs setfattr -n user.x -v yz
-	find $SCRATCH_MNT/descend | xargs setfattr -n user.1 -v 23
-	find $SCRATCH_MNT/here | xargs setfattr -n trusted.a -v bc
-	find $SCRATCH_MNT/here | xargs setfattr -n trusted.9 -v 87
+	mkdir -p $testdir/here/up/ascend
+	mkdir -p $testdir/descend/down/here
+	find $testdir/descend | xargs setfattr -n user.x -v yz
+	find $testdir/descend | xargs setfattr -n user.1 -v 23
+	find $testdir/here | xargs setfattr -n trusted.a -v bc
+	find $testdir/here | xargs setfattr -n trusted.9 -v 87
 	# whack a symlink in the middle, just to be difficult
-	ln -s $SCRATCH_MNT/here/up $SCRATCH_MNT/descend/and
+	ln -s $testdir/here/up $testdir/descend/and
 	# dump out our new starting point
-	find $SCRATCH_MNT | LC_COLLATE=POSIX sort | _filter_scratch | grep -v "lost+found"
+	find $testdir | LC_COLLATE=POSIX sort | _filter_test_dir | grep -v "lost+found"
 }
 
 _extend_test_bed
 
 echo
 echo "*** directory descent with us following symlinks"
-getfattr -h -L -R -m '.' -e hex $SCRATCH_MNT | _sort_getfattr_output
+getfattr -h -L -R -m '.' -e hex $testdir | _sort_getfattr_output
 
 echo
 echo "*** directory descent without following symlinks"
-getfattr -h -P -R -m '.' -e hex $SCRATCH_MNT | _sort_getfattr_output
+getfattr -h -P -R -m '.' -e hex $testdir | _sort_getfattr_output
 
 # 
 # Test the backup/restore code
@@ -179,7 +178,7 @@ echo; echo
 _backup()
 {
 	# NB: no filtering of scratch here... (need to restore too)
-	$GETFATTR_PROG --absolute-names -dh -R -m '.' $SCRATCH_MNT >$1
+	$GETFATTR_PROG --absolute-names -dh -R -m '.' $testdir >$1
 	echo BACKUP $1 >>$seqres.full
 	cat $1 >> $seqres.full
 	[ ! -s $1 ] && echo "warning: $1 (backup file) is empty"
@@ -188,10 +187,10 @@ _backup()
 echo "*** backup everything"
 _backup $tmp.backup1
 
-echo "*** clear out the scratch device"
-rm -fr $SCRATCH_MNT/*
+echo "*** clear out the test dir"
+rm -fr $testdir/*
 echo "AFTER REMOVE" >>$seqres.full
-getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
+getfattr -L -R -m '.' $testdir >>$seqres.full
 
 echo "*** reset test bed with no extended attributes"
 _create_test_bed
@@ -202,7 +201,7 @@ setfattr -h --restore=$tmp.backup1
 _backup $tmp.backup2
 
 echo "AFTER RESTORE" >>$seqres.full
-getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
+getfattr -L -R -m '.' $testdir >>$seqres.full
 
 echo "*** compare before and after backups"
 diff $tmp.backup1 $tmp.backup2
diff --git a/tests/generic/062.out b/tests/generic/062.out
index 8cc3c65..042e6e0 100644
--- a/tests/generic/062.out
+++ b/tests/generic/062.out
@@ -1,57 +1,57 @@
 QA output created by 062
 *** create test bed
-SCRATCH_MNT
-SCRATCH_MNT/dev
-SCRATCH_MNT/dev/b
-SCRATCH_MNT/dev/c
-SCRATCH_MNT/dev/p
-SCRATCH_MNT/dir
-SCRATCH_MNT/lnk
-SCRATCH_MNT/reg
+TEST_DIR/attr062
+TEST_DIR/attr062/dev
+TEST_DIR/attr062/dev/b
+TEST_DIR/attr062/dev/c
+TEST_DIR/attr062/dev/p
+TEST_DIR/attr062/dir
+TEST_DIR/attr062/lnk
+TEST_DIR/attr062/reg
 
 === TYPE reg; NAMESPACE user
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name=0xbabe
 user.name2=0xdeadbeef
 user.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name=0sur4=
 user.name2=0s3q2+7w==
 user.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name=0xbabe
 user.name2=0xdeaf
 user.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name=0xbabe
 user.name2=0xdecade
 user.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/reg: user.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/reg: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=reg, nsp=user)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 user.name=0xbabe
 user.name3=0xdeface
 
@@ -59,46 +59,46 @@ user.name3=0xdeface
 === TYPE dir; NAMESPACE user
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name=0xbabe
 user.name2=0xdeadbeef
 user.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name=0sur4=
 user.name2=0s3q2+7w==
 user.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name=0xbabe
 user.name2=0xdeaf
 user.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name=0xbabe
 user.name2=0xdecade
 user.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/dir: user.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/dir: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=dir, nsp=user)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 user.name=0xbabe
 user.name3=0xdeface
 
@@ -106,146 +106,146 @@ user.name3=0xdeface
 === TYPE lnk; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
 *** grow value of existing attribute
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
 *** set an empty value for second attribute
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
-SCRATCH_MNT/lnk: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
+TEST_DIR/attr062/lnk: user.name2: No such attribute or operation not permitted
 *** overwrite empty value
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
-SCRATCH_MNT/lnk: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
+TEST_DIR/attr062/lnk: user.name2: No such attribute or operation not permitted
 *** remove attribute
-setfattr: SCRATCH_MNT/lnk: Operation not permitted
-SCRATCH_MNT/lnk: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/lnk: Operation not permitted
+TEST_DIR/attr062/lnk: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=lnk, nsp=user)
 
 === TYPE dev/b; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
 *** grow value of existing attribute
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
 *** set an empty value for second attribute
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
-SCRATCH_MNT/dev/b: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
+TEST_DIR/attr062/dev/b: user.name2: No such attribute or operation not permitted
 *** overwrite empty value
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
-SCRATCH_MNT/dev/b: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
+TEST_DIR/attr062/dev/b: user.name2: No such attribute or operation not permitted
 *** remove attribute
-setfattr: SCRATCH_MNT/dev/b: Operation not permitted
-SCRATCH_MNT/dev/b: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/b: Operation not permitted
+TEST_DIR/attr062/dev/b: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/b, nsp=user)
 
 === TYPE dev/c; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
 *** grow value of existing attribute
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
 *** set an empty value for second attribute
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
-SCRATCH_MNT/dev/c: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
+TEST_DIR/attr062/dev/c: user.name2: No such attribute or operation not permitted
 *** overwrite empty value
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
-SCRATCH_MNT/dev/c: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
+TEST_DIR/attr062/dev/c: user.name2: No such attribute or operation not permitted
 *** remove attribute
-setfattr: SCRATCH_MNT/dev/c: Operation not permitted
-SCRATCH_MNT/dev/c: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/c: Operation not permitted
+TEST_DIR/attr062/dev/c: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/c, nsp=user)
 
 === TYPE dev/p; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
 *** grow value of existing attribute
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
 *** set an empty value for second attribute
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
-SCRATCH_MNT/dev/p: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
+TEST_DIR/attr062/dev/p: user.name2: No such attribute or operation not permitted
 *** overwrite empty value
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
-SCRATCH_MNT/dev/p: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
+TEST_DIR/attr062/dev/p: user.name2: No such attribute or operation not permitted
 *** remove attribute
-setfattr: SCRATCH_MNT/dev/p: Operation not permitted
-SCRATCH_MNT/dev/p: user.name2: No such attribute or operation not permitted
+setfattr: TEST_DIR/attr062/dev/p: Operation not permitted
+TEST_DIR/attr062/dev/p: user.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/p, nsp=user)
 
 === TYPE reg; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/reg: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/reg: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=reg, nsp=trusted)
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
@@ -255,46 +255,46 @@ user.name3=0xdeface
 === TYPE dir; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/dir: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/dir: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=dir, nsp=trusted)
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
@@ -304,46 +304,46 @@ user.name3=0xdeface
 === TYPE lnk; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/lnk: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/lnk: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=lnk, nsp=trusted)
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
@@ -351,46 +351,46 @@ trusted.name3=0xdeface
 === TYPE dev/b; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/dev/b: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/dev/b: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/b, nsp=trusted)
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
@@ -398,46 +398,46 @@ trusted.name3=0xdeface
 === TYPE dev/c; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/dev/c: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/dev/c: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/c, nsp=trusted)
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
@@ -445,120 +445,120 @@ trusted.name3=0xdeface
 === TYPE dev/p; NAMESPACE trusted
 
 *** set/get one initially empty attribute
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name
 
 *** overwrite empty, set several new attributes
 *** fetch several attribute names and values (hex)
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name2=0xdeadbeef
 trusted.name3=0xdeface
 
 *** fetch several attribute names and values (base64)
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0sur4=
 trusted.name2=0s3q2+7w==
 trusted.name3=0s3vrO
 
 *** shrink value of an existing attribute
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name2=0xdeaf
 trusted.name3=0xdeface
 
 *** grow value of existing attribute
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name2=0xdecade
 trusted.name3=0xdeface
 
 *** set an empty value for second attribute
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name2
 
 *** overwrite empty value
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name2=0xcafe
 
 *** remove attribute
-SCRATCH_MNT/dev/p: trusted.name2: No such attribute or operation not permitted
+TEST_DIR/attr062/dev/p: trusted.name2: No such attribute or operation not permitted
 *** final list (strings, type=dev/p, nsp=trusted)
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
 
 
 *** extend test bed
-SCRATCH_MNT
-SCRATCH_MNT/descend
-SCRATCH_MNT/descend/and
-SCRATCH_MNT/descend/down
-SCRATCH_MNT/descend/down/here
-SCRATCH_MNT/dev
-SCRATCH_MNT/dev/b
-SCRATCH_MNT/dev/c
-SCRATCH_MNT/dev/p
-SCRATCH_MNT/dir
-SCRATCH_MNT/here
-SCRATCH_MNT/here/up
-SCRATCH_MNT/here/up/ascend
-SCRATCH_MNT/lnk
-SCRATCH_MNT/reg
+TEST_DIR/attr062
+TEST_DIR/attr062/descend
+TEST_DIR/attr062/descend/and
+TEST_DIR/attr062/descend/down
+TEST_DIR/attr062/descend/down/here
+TEST_DIR/attr062/dev
+TEST_DIR/attr062/dev/b
+TEST_DIR/attr062/dev/c
+TEST_DIR/attr062/dev/p
+TEST_DIR/attr062/dir
+TEST_DIR/attr062/here
+TEST_DIR/attr062/here/up
+TEST_DIR/attr062/here/up/ascend
+TEST_DIR/attr062/lnk
+TEST_DIR/attr062/reg
 
 *** directory descent with us following symlinks
-# file: SCRATCH_MNT/descend
+# file: TEST_DIR/attr062/descend
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/descend/and/ascend
+# file: TEST_DIR/attr062/descend/and/ascend
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/descend/down
+# file: TEST_DIR/attr062/descend/down
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/descend/down/here
+# file: TEST_DIR/attr062/descend/down/here
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
 user.name3=0xdeface
 
-# file: SCRATCH_MNT/here
+# file: TEST_DIR/attr062/here
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/here/up
+# file: TEST_DIR/attr062/here/up
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/here/up/ascend
+# file: TEST_DIR/attr062/here/up/ascend
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
@@ -566,53 +566,53 @@ user.name3=0xdeface
 
 
 *** directory descent without following symlinks
-# file: SCRATCH_MNT/descend
+# file: TEST_DIR/attr062/descend
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/descend/down
+# file: TEST_DIR/attr062/descend/down
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/descend/down/here
+# file: TEST_DIR/attr062/descend/down/here
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/dev/b
+# file: TEST_DIR/attr062/dev/b
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dev/c
+# file: TEST_DIR/attr062/dev/c
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dev/p
+# file: TEST_DIR/attr062/dev/p
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/dir
+# file: TEST_DIR/attr062/dir
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
 user.name3=0xdeface
 
-# file: SCRATCH_MNT/here
+# file: TEST_DIR/attr062/here
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/here/up
+# file: TEST_DIR/attr062/here/up
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/here/up/ascend
+# file: TEST_DIR/attr062/here/up/ascend
 trusted.9=0x3837
 trusted.a=0x6263
 
-# file: SCRATCH_MNT/lnk
+# file: TEST_DIR/attr062/lnk
 trusted.name=0xbabe
 trusted.name3=0xdeface
 
-# file: SCRATCH_MNT/reg
+# file: TEST_DIR/attr062/reg
 trusted.name=0xbabe
 trusted.name3=0xdeface
 user.name=0xbabe
@@ -621,33 +621,33 @@ user.name3=0xdeface
 
 
 *** backup everything
-*** clear out the scratch device
+*** clear out the test dir
 *** reset test bed with no extended attributes
 *** create test bed
-SCRATCH_MNT
-SCRATCH_MNT/dev
-SCRATCH_MNT/dev/b
-SCRATCH_MNT/dev/c
-SCRATCH_MNT/dev/p
-SCRATCH_MNT/dir
-SCRATCH_MNT/lnk
-SCRATCH_MNT/reg
+TEST_DIR/attr062
+TEST_DIR/attr062/dev
+TEST_DIR/attr062/dev/b
+TEST_DIR/attr062/dev/c
+TEST_DIR/attr062/dev/p
+TEST_DIR/attr062/dir
+TEST_DIR/attr062/lnk
+TEST_DIR/attr062/reg
 *** extend test bed
-SCRATCH_MNT
-SCRATCH_MNT/descend
-SCRATCH_MNT/descend/and
-SCRATCH_MNT/descend/down
-SCRATCH_MNT/descend/down/here
-SCRATCH_MNT/dev
-SCRATCH_MNT/dev/b
-SCRATCH_MNT/dev/c
-SCRATCH_MNT/dev/p
-SCRATCH_MNT/dir
-SCRATCH_MNT/here
-SCRATCH_MNT/here/up
-SCRATCH_MNT/here/up/ascend
-SCRATCH_MNT/lnk
-SCRATCH_MNT/reg
+TEST_DIR/attr062
+TEST_DIR/attr062/descend
+TEST_DIR/attr062/descend/and
+TEST_DIR/attr062/descend/down
+TEST_DIR/attr062/descend/down/here
+TEST_DIR/attr062/dev
+TEST_DIR/attr062/dev/b
+TEST_DIR/attr062/dev/c
+TEST_DIR/attr062/dev/p
+TEST_DIR/attr062/dir
+TEST_DIR/attr062/here
+TEST_DIR/attr062/here/up
+TEST_DIR/attr062/here/up/ascend
+TEST_DIR/attr062/lnk
+TEST_DIR/attr062/reg
 *** restore everything
 *** compare before and after backups
 
-- 
1.7.10.4


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

[PATCH 02/12] 069: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0002-069-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 2013 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/069     |   23 +++++++++--------------
 tests/generic/069.out |    2 --
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/tests/generic/069 b/tests/generic/069
index c3fa862..f55da37 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -39,18 +39,13 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os IRIX Linux
 
-_require_scratch
 rm -f $seqres.full
 
-umount $SCRATCH_DEV >/dev/null 2>&1
+dir="$TEST_DIR/append"
 
-echo "*** mkfs"
-_scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
-
-echo "*** mount FS"
-_scratch_mount >/dev/null || _fail "mount failed"
-
-cd $SCRATCH_MNT
+rm -rf $dir
+mkdir $dir
+cd $dir
 
 sizes="1 20 300 40000 3000000 12345"
 for size in $sizes ; do
@@ -61,18 +56,18 @@ done
 cd $here
 
 wait
-ls -lh $SCRATCH_MNT >> $seqres.full
+ls -lh $dir >> $seqres.full
 echo "*** PIDs file" >> $seqres.full
-cat $SCRATCH_MNT/pids >> $seqres.full
+cat $dir/pids >> $seqres.full
 
-cat $SCRATCH_MNT/pids | while read pid size
+cat $dir/pids | while read pid size
 do
 	echo "*** checking file with $size integers"
 	echo checking pid=$pid size=$size >> $seqres.full
-	$here/src/append_reader $SCRATCH_MNT/testfile.$pid
+	$here/src/append_reader $dir/testfile.$pid
 	status=$?
 	[ $status -ne 0 ] && \
-		echo "maybe corrupt O_APPEND to $SCRATCH_MOUNT/testfile.$pid!"
+		echo "maybe corrupt O_APPEND to $dir/testfile.$pid!"
 	echo status: $status >> $seqres.full
 done
 
diff --git a/tests/generic/069.out b/tests/generic/069.out
index 0d7b23c..491ea57 100644
--- a/tests/generic/069.out
+++ b/tests/generic/069.out
@@ -1,6 +1,4 @@
 QA output created by 069
-*** mkfs
-*** mount FS
 *** checking file with 1 integers
 *** checking file with 20 integers
 *** checking file with 300 integers
-- 
1.7.10.4


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

[PATCH 03/12] 079: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0003-079-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 1226 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/079 |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/generic/079 b/tests/generic/079
index a533484..044447a 100755
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -36,8 +36,7 @@ _cleanup()
 {
     cd /
     echo "*** cleaning up"
-    $timmutable -r $SCRATCH_MNT/$seq
-    umount $SCRATCH_MNT
+    $timmutable -r $TEST_DIR/$seq
 }
 
 # get standard environment, filters and checks
@@ -49,16 +48,11 @@ _supported_fs generic
 _supported_os Linux
 
 _require_attrs
-_require_scratch
 
 [ -x $timmutable ] || _notrun "t_immutable was not built for this platform"
 
-# real QA test starts here
-_scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
-_scratch_mount || _fail "mount failed"
-
 echo "*** starting up"
-$timmutable -c $SCRATCH_MNT/$seq >$tmp.out 2>&1
+$timmutable -c $TEST_DIR/$seq >$tmp.out 2>&1
 if grep -q 'Operation not supported' $tmp.out; then
     rm -f $tmp.out
     _notrun "Setting immutable/append flag not supported"
-- 
1.7.10.4


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

[PATCH 04/12] 100: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0004-100-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 1238 bytes --]

The test does not require a fresh file system.  In addition make sure we always
prepare the tarball outside the tested file system to get a better chance to
catch differences between the tested filesystem and otherṡ.  We currently skip
that if running on xfs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/100 |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/generic/100 b/tests/generic/100
index 05d766f..2e73c1a 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -47,7 +47,6 @@ _supported_os IRIX Linux
 
 # Use _populate_fs() in common/rc to create a directory structure.
 TEMP_DIR=/tmp
-[ "$FSTYP" == "xfs" ] && TEMP_DIR=$TEST_DIR
 TAR_FILE=temp.tar
 NDIRS=3
 NFILES=6
@@ -67,9 +66,6 @@ _populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$seqres
 # Then tar up the directory structure
 tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$seqres.full 2>&1
 
-# create f/s
-_require_scratch
-
 # untar on f/s
 cd $TEST_DIR
 tar -xRvf $TEMP_DIR/$TAR_FILE >>$seqres.full 2>&1
@@ -79,8 +75,5 @@ cd $here
 ls -R -l ${TEST_DIR}${POPULATED_DIR} >>$seqres.full 2>&1
 diff -qr $POPULATED_DIR ${TEST_DIR}${POPULATED_DIR}
 
-cd /
-_check_scratch_fs
-
 status=0
 exit
-- 
1.7.10.4



[-- Attachment #2: Type: text/plain, Size: 121 bytes --]

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

[PATCH 05/12] 105: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0005-105-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 2202 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/105 |   31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/tests/generic/105 b/tests/generic/105
index 2f99401..341d0b8 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -52,48 +52,39 @@ _supported_os IRIX Linux
 
 rm -f $seqres.full
 
-_require_scratch
 _require_acls
 
 _acl_setup_ids
 
-umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***"                         >>$seqres.full
-echo ""                                     >>$seqres.full
-_scratch_mkfs                               >>$seqres.full 2>&1 \
-	|| _fail "mkfs failed"
-_scratch_mount                              >>$seqres.full 2>&1 \
-	|| _fail "mount failed"
-
-cd $SCRATCH_MNT
+cd $TESTDIR
 
 # create a dir with out execute perms
-mkdir -m 600 subdir
+mkdir -m 600 subdir105
 
 # make it owned by $acl1
-chown $acl1 subdir
+chown $acl1 subdir105
 
 # put a file in the directory
-echo data > subdir/file
-_ls_l subdir/file | awk '{ print $1, $3 }'
+echo data > subdir105/file
+_ls_l subdir105/file | awk '{ print $1, $3 }'
 
 # add an ACL with a user ACE which has no exec permission 
 if [ "$HOSTOS" == "Linux" ]; then
-    setfacl -m u:$acl1:r subdir
+    setfacl -m u:$acl1:r subdir105
 elif [ "$HOSTOS" == "IRIX" ]; then
-    chacl u:$acl:r--,g::---,o::--- subdir
+    chacl u:$acl:r--,g::---,o::--- subdir105
 else
     echo "Unknown OS!"
     exit 1
 fi
 
-# With the bug this gives: `ls: subdir/file: Permission denied'
+# With the bug this gives: `ls: subdir105/file: Permission denied'
 # because one needs at least an exec perm somewhere in acl
 # However, this should not hold true for directories.
-_ls_l subdir/file | awk '{ print $1, $3 }'
+_ls_l subdir105/file | awk '{ print $1, $3 }'
 
-# With the bug this gives: `subdir/file2: Permission denied'.
-echo data2 > subdir/file2
+# With the bug this gives: `subdir105/file2: Permission denied'.
+echo data2 > subdir105/file2
 
 # success, all done
 status=0
-- 
1.7.10.4


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

[PATCH 06/12] 117: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0006-117-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 1776 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/117     |   24 +++++-------------------
 tests/generic/117.out |    2 --
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/tests/generic/117 b/tests/generic/117
index f81265b..504dd88 100755
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -78,38 +78,24 @@ _cleanup()
 _supported_fs generic
 _supported_os IRIX Linux
 
-_require_scratch
 _require_attrs
 
 rm -f $seqres.full
-umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***"                         >>$seqres.full
-echo ""                                     >>$seqres.full
-_scratch_mkfs                               >>$seqres.full 2>&1 \
-    || _fail "mkfs failed"
-_scratch_mount                              >>$seqres.full 2>&1 \
-    || _fail "mount failed"
 
-mkdir -p $SCRATCH_MNT/fsstress
+testdir=$TEST_DIR/fsstress.$seq
+rm -rf $testdir
+mkdir -p $testdir
 
 echo
 echo Running fsstress in serial:
 i=0
 while [ $i -lt $ITERATIONS ]; do
     echo fsstress iteration: $i | tee -a $seqres.full
-    $FSSTRESS_PROG \
-	-d $SCRATCH_MNT/fsstress \
+    $FSSTRESS_PROG -d $testdir \
 	$fss_ops -S c >>$seqres.full 2>&1
 
     let i=$i+1
 done
 
-cd /
-umount $SCRATCH_MNT
-echo 
-echo Checking filesystem
-_check_scratch_fs
-_scratch_mount
-
-status=$?
+status=0
 exit
diff --git a/tests/generic/117.out b/tests/generic/117.out
index 1306ebc..e295515 100644
--- a/tests/generic/117.out
+++ b/tests/generic/117.out
@@ -11,5 +11,3 @@ fsstress iteration: 6
 fsstress iteration: 7
 fsstress iteration: 8
 fsstress iteration: 9
-
-Checking filesystem
-- 
1.7.10.4


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

[PATCH 07/12] 124: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0007-124-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 1029 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/124 |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/generic/124 b/tests/generic/124
index 93ec4a1..132f2bf 100755
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -48,12 +48,10 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
-_require_scratch
-_scratch_mkfs >/dev/null 2>&1
-_scratch_mount
+rm -f $TEST_DIR/rw_pattern.$seq $TEST_DIR/rw_pattern.$seq
 
 # Run preallo_rw_pattern on both test and scratch partitions
-for TESTFILE in $TEST_DIR/rw_pattern.tmp $SCRATCH_MNT/rw_pattern.tmp
+for TESTFILE in $TEST_DIR/rw_pattern.$seq $TEST_DIR/rw_pattern.$seq
   do
   count=1
   while (( count < 101 ))
@@ -74,9 +72,4 @@ if (test $? -eq 0 ) then
     status=0
 fi
 
-umount $SCRATCH_DEV
-
-_check_test_fs
-_check_scratch_fs
-
 exit 
-- 
1.7.10.4


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

[PATCH 08/12] 130: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0008-130-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 4949 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/130 |   47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/tests/generic/130 b/tests/generic/130
index 8367dc7..833474d 100755
--- a/tests/generic/130
+++ b/tests/generic/130
@@ -48,37 +48,38 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux IRIX
 
-_require_scratch
 _require_sparse_files
 
-_scratch_mkfs >/dev/null 2>&1
-_scratch_mount
+testdir=$TEST_DIR/dir.$seq
+
+rm -rf $testdir
+mkdir $testdir
 
 echo "End-of-file zeroing with direct I/O"
 $XFS_IO_PROG -f -d -t -c "pwrite -S 0x63 0 65536" \
     -c "truncate 1" \
     -c "pwrite -S 0x41 65536 65536" \
     -c "pread -v 0 131072" \
-    $SCRATCH_MNT/eof-zeroing_direct | _filter_xfs_io_unique
+    $testdir/eof-zeroing_direct | _filter_xfs_io_unique
 
 echo
 echo "Basic Block Hole test"
 $XFS_IO_PROG -f -t -c "truncate 8192" \
     -c "pread -v 5000 3000" \
-    $SCRATCH_MNT/blackhole | _filter_xfs_io_unique
+    $testdir/blackhole | _filter_xfs_io_unique
 
 echo
 echo "Test buffered and direct IO coherency"
 $XFS_IO_PROG -f -t -c "pwrite -S 0x41 8000 1000" \
     -c "pwrite -S 0x57 4000 1000" \
-    $SCRATCH_MNT/buff_direct_coherency | _filter_xfs_io_unique
+    $testdir/buff_direct_coherency | _filter_xfs_io_unique
 
 $XFS_IO_PROG -d -c "pwrite -S 0x78 20480 4096"\
     -c "pwrite -S 0x79 4096 4096"\
-    $SCRATCH_MNT/buff_direct_coherency | _filter_xfs_io_unique
+    $testdir/buff_direct_coherency | _filter_xfs_io_unique
 
 $XFS_IO_PROG -c "pread -v 0 9000"\
-    $SCRATCH_MNT/buff_direct_coherency | _filter_xfs_io_unique
+    $testdir/buff_direct_coherency | _filter_xfs_io_unique
 
 echo
 echo "Test direct read and write"
@@ -86,19 +87,19 @@ $XFS_IO_PROG -f -d -t -c "pwrite -S 0x78 0 65536"\
     -c "pread -v 0 65536"\
     -c "pwrite -S 0x46 65536 6553600"\
     -c "pread -v 0 6619136"\
-    $SCRATCH_MNT/direct_io | _filter_xfs_io_unique
+    $testdir/direct_io | _filter_xfs_io_unique
 
 $XFS_IO_PROG -d -c "pread -v 0 6619136"\
-    $SCRATCH_MNT/direct_io | _filter_xfs_io_unique
+    $testdir/direct_io | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -d -t -c "pwrite -S 0x61 0 65536"\
     -c "pread -v 0 65536"\
     -c "pwrite -S 0x62 65536 131072"\
     -c "pread -v 0 131072"\
-    $SCRATCH_MNT/async_direct_io | _filter_xfs_io_unique
+    $testdir/async_direct_io | _filter_xfs_io_unique
 
 $XFS_IO_PROG -d -c "pread -v 0 131072"\
-    $SCRATCH_MNT/async_direct_io | _filter_xfs_io_unique
+    $testdir/async_direct_io | _filter_xfs_io_unique
 
 echo
 echo "FSB Edge test"
@@ -108,30 +109,30 @@ $XFS_IO_PROG -f -t -c "truncate 131072"\
     -c "truncate 131072"\
     -c "pwrite -S 0x61 65535 2"\
     -c "pread -v 0 131072"\
-    $SCRATCH_MNT/fsb_edge_test | _filter_xfs_io_unique
+    $testdir/fsb_edge_test | _filter_xfs_io_unique
 
 echo
 echo "Open Trunk test (O_TRUNC)"
 for n in 0 1 2 3 4
 do
-    $XFS_IO_PROG -f -t -c "pread -v 0 100" $SCRATCH_MNT/$n | _filter_xfs_io_unique
+    $XFS_IO_PROG -f -t -c "pread -v 0 100" $testdir/$n | _filter_xfs_io_unique
 
-    echo "Test" > $SCRATCH_MNT/$n
-    $XFS_IO_PROG -f -t -c "pread -v 0 100" $SCRATCH_MNT/$n | _filter_xfs_io_unique
-    cat $SCRATCH_MNT/$n
+    echo "Test" > $testdir/$n
+    $XFS_IO_PROG -f -t -c "pread -v 0 100" $testdir/$n | _filter_xfs_io_unique
+    cat $testdir/$n
 done
 echo "DONE"
 
 echo
 echo "Append test"
-echo "append to me" > $SCRATCH_MNT/append
+echo "append to me" > $testdir/append
 $XFS_IO_PROG -a -c "pwrite -S 0x61 0 10" \
     -c "pread -v 0 24"\
-    $SCRATCH_MNT/append | _filter_xfs_io_unique
+    $testdir/append | _filter_xfs_io_unique
 
 echo
 echo "Small Vector Async"
-echo "abcdefghijklmnopqrstuvwxyz" > $SCRATCH_MNT/small_vector_async
+echo "abcdefghijklmnopqrstuvwxyz" > $testdir/small_vector_async
 $XFS_IO_PROG -f -c "pread -v 0 1"\
     -c "pread -v 1 1"\
     -c "pread -v 2 1"\
@@ -186,11 +187,11 @@ $XFS_IO_PROG -f -c "pread -v 0 1"\
     -c "pread -v 10000000004 4"\
     -c "pread -v 10000000008 4"\
     -c "pread -v 10000000012 4"\
-    $SCRATCH_MNT/small_vector_async | _filter_xfs_io_unique
+    $testdir/small_vector_async | _filter_xfs_io_unique
 
 echo
 echo "Small Vector Sync"
-echo "abcdefghijklmnopqrstuvwxyz" > $SCRATCH_MNT/small_vector_async
+echo "abcdefghijklmnopqrstuvwxyz" > $testdir/small_vector_async
 $XFS_IO_PROG -f -s -c "pread -v 0 1"\
     -c "pread -v 1 1"\
     -c "pread -v 2 1"\
@@ -245,7 +246,7 @@ $XFS_IO_PROG -f -s -c "pread -v 0 1"\
     -c "pread -v 10000000004 4"\
     -c "pread -v 10000000008 4"\
     -c "pread -v 10000000012 4"\
-    $SCRATCH_MNT/small_vector_async | _filter_xfs_io_unique
+    $testdir/small_vector_async | _filter_xfs_io_unique
 
 status=0
 exit
-- 
1.7.10.4


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

[PATCH 09/12] 132: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0009-132-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 5525 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/132 |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/tests/generic/132 b/tests/generic/132
index aa52c7d..3053e67 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -40,10 +40,9 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux IRIX
 
-_require_scratch
-
-_scratch_mkfs >/dev/null 2>&1
-_scratch_mount
+testdir="$TEST_DIR/dir.$seq"
+rm -rf $testdir
+mkdir $testdir
 
 $XFS_IO_PROG -f -t -c "pwrite -S 0x63 0 512" \
     -c "pwrite -S 0x64 512 512" \
@@ -61,7 +60,7 @@ $XFS_IO_PROG -f -t -c "pwrite -S 0x63 0 512" \
     -c "pread -v 2560 512" \
     -c "pread -v 3072 512" \
     -c "pread -v 3584 512" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x63 4096 1024" \
     -c "pwrite -S 0x6B 5120 1024" \
@@ -75,7 +74,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x63 4096 1024" \
     -c "pread -v 5120 1024" \
     -c "pread -v 6144 1024" \
     -c "pread -v 7168 1024" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x6E 8192 2048" \
     -c "pwrite -S 0x6F 10240 2048" \
@@ -85,14 +84,14 @@ $XFS_IO_PROG -f -c "pwrite -S 0x6E 8192 2048" \
     -c "pread -v 6144 2048" \
     -c "pread -v 8192 2048" \
     -c "pread -v 10240 2048" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x70 12288 4096" \
     -c "pread -v 0 4096" \
     -c "pread -v 4096 4096" \
     -c "pread -v 8192 4096" \
     -c "pread -v 12288 4096" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x71 16384 8192" \
     -c "pwrite -S 0x72 24576 8192" \
@@ -100,7 +99,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x71 16384 8192" \
     -c "pread -v 8192 8192" \
     -c "pread -v 8192 8192" \
     -c "pread -v 16384 8192" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x73 32768 16384" \
     -c "pwrite -S 0x74 49152 16384" \
@@ -108,7 +107,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x73 32768 16384" \
     -c "pread -v 16384 16384" \
     -c "pread -v 32768 16384" \
     -c "pread -v 49152 16384" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x75 65536 32768" \
     -c "pwrite -S 0x76 98304 32768" \
@@ -116,7 +115,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x75 65536 32768" \
     -c "pread -v 32768 32768" \
     -c "pread -v 65536 32768" \
     -c "pread -v 98304 32768" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 131072 65536" \
     -c "pwrite -S 0x77 196608 65536" \
@@ -124,7 +123,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x76 131072 65536" \
     -c "pread -v 65536 65536" \
     -c "pread -v 131072 65536" \
     -c "pread -v 196608 65536" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 262144 131072" \
     -c "pwrite -S 0x77 393216 131072" \
@@ -132,14 +131,14 @@ $XFS_IO_PROG -f -c "pwrite -S 0x76 262144 131072" \
     -c "pread -v 131072 131072" \
     -c "pread -v 262144 131072" \
     -c "pread -v 393216 131072" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 524288 524288" \
     -c "pwrite -S 0x77 1048576 524288" \
     -c "pread -v 0 524288" \
     -c "pread -v 524288 524288" \
     -c "pread -v 1048576 524288" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pwrite -S 0x33 2097152 1048576" \
@@ -158,7 +157,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pread -v 6291456 1048576" \
     -c "pread -v 7340032 1048576" \
     -c "pread -v 8388608 1048576" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pwrite -S 0x33 2097152 1048576" \
@@ -179,7 +178,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pread -v 7340032 1048576" \
     -c "pread -v 8388608 1048576" \
     -c "pread -v 9437184 1048576" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x92 10485760 10485760" \
     -c "pwrite -S 0x93 20971520 10485760" \
@@ -200,7 +199,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x92 10485760 10485760" \
     -c "pread -v 73400320 10485760" \
     -c "pread -v 83886080 10485760" \
     -c "pread -v 94371840 10485760" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 status=0
 exit
-- 
1.7.10.4


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

[PATCH 10/12] 141: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0010-141-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 921 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/141 |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/generic/141 b/tests/generic/141
index fa08484..3509c4a 100755
--- a/tests/generic/141
+++ b/tests/generic/141
@@ -39,16 +39,11 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
-_require_scratch
-_scratch_mkfs >/dev/null 2>&1
-_scratch_mount
-
 # create file, mmap a region and mmap read it
-file=$SCRATCH_MNT/mmap
-
-$XFS_IO_PROG -f -c "pwrite 0 1024k" -c "mmap 64k 64k" -c "mread -r" $file > /dev/null
+file=$TEST_DIR/mmap.$seq
 
 rm -f $file
+$XFS_IO_PROG -f -c "pwrite 0 1024k" -c "mmap 64k 64k" -c "mread -r" $file > /dev/null
 
 status=0
 exit 
-- 
1.7.10.4


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

[PATCH 11/12] 225: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0011-225-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 865 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/225 |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/generic/225 b/tests/generic/225
index 73b125a..c77c37f 100755
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -43,14 +43,10 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
-_require_scratch
-
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount > /dev/null 2>&1
 
 rm -f $seqres.full
-fiemapfile=$SCRATCH_MNT/$seq.fiemap
-fiemaplog=$SCRATCH_MNT/$seq.log
+fiemapfile=$TEST_DIR/$seq.fiemap
+fiemaplog=$TEST_DIR/$seq.log
 
 [ -x $here/src/fiemap-tester ] || _notrun "fiemap-tester not built"
 
-- 
1.7.10.4


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

[PATCH 12/12] 319: use TEST_DIR instead of a SCRATCH_DEV

[Christoph Hellwig]

[-- Attachment #1: 0012-319-use-TEST_DIR-instead-of-a-SCRATCH_DEV.patch --]
[-- Type: text/plain, Size: 1721 bytes --]

The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/319     |   12 +++++-------
 tests/generic/319.out |    4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/generic/319 b/tests/generic/319
index 046969f..c382bae 100755
--- a/tests/generic/319
+++ b/tests/generic/319
@@ -51,20 +51,18 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_os Linux
 _supported_fs generic
 _require_acls
-_require_scratch
 _need_to_be_root
 
 rm -f $seqres.full
 
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount
+testdir="$TEST_DIR/testdir319"
 
-mkdir $SCRATCH_MNT/testdir
-setfacl -d --set u::rwx,g::rwx,o::- $SCRATCH_MNT/testdir
-getfacl --absolute-names $SCRATCH_MNT/testdir | _filter_scratch
+mkdir $testdir
+setfacl -d --set u::rwx,g::rwx,o::- $testdir
+getfacl --absolute-names $testdir | _filter_test_dir
 
 mkdir $SCRATCH_MNT/testdir/testsubdir
-getfacl --absolute-names $SCRATCH_MNT/testdir/testsubdir | _filter_scratch
+getfacl --absolute-names $testdir/testsubdir | _filter_test_dir
 
 # success, all done
 status=0
diff --git a/tests/generic/319.out b/tests/generic/319.out
index b090bfa..7897647 100644
--- a/tests/generic/319.out
+++ b/tests/generic/319.out
@@ -1,5 +1,5 @@
 QA output created by 319
-# file: SCRATCH_MNT/testdir
+# file: TEST_DIR/testdir319
 # owner: root
 # group: root
 user::rwx
@@ -9,7 +9,7 @@ default:user::rwx
 default:group::rwx
 default:other::---
 
-# file: SCRATCH_MNT/testdir/testsubdir
+# file: TEST_DIR/testdir319/testsubdir
 # owner: root
 # group: root
 user::rwx
-- 
1.7.10.4


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

Re: [PATCH 00/12] run more generic tests on TEST_DIR

[Dave Chinner]

On Tue, Dec 10, 2013 at 11:34:45PM -0800, Christoph Hellwig wrote:
> As Stanislav pointed out previously various tests worked fine on NFS
> when it still defined a scratch dir that we abused for the test dir.
> 
> This series makes various tests that don't require specific file system
> sizes or parameters run on TEST_DIR instead of using the scratch devices.
> 
> This also allow to remove various bits of boilerplat code as the TEST_DIR
> is always available, and checked after each test.

I'm not sure this is such a good idea. The test_dir is a fixed
filesystem designed to persiste between test harness runs to allow
testing on an aged filesystem.

The scratch dev, OTOH, is used to give tests a known state before the test
begins, and to enable different filesystem configurations to be
tested easily. That is:

$ ./check -g auto

and

$ MKFS_OPTIONS="-b size=512" ./check -g auto

run the tests on a differently configured scratch device. I use this
all the time to change the filesystem config I'm testing against. By
moving all these tests to the TEST_DEV, these tests are no longer
run on the device that is configured specifically the way I want it
configured for the given test run.

So, I think this is a step backwards in terms of being able to
quickly iterate and cover different filesystem configurations, and
as such I don't really like it as a solution. What other options do
we have?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [PATCH 00/12] run more generic tests on TEST_DIR

[Dave Chinner]

On Thu, Dec 12, 2013 at 10:03:12AM -0800, Christoph Hellwig wrote:
> On Thu, Dec 12, 2013 at 09:50:12AM +1100, Dave Chinner wrote:
> > I'm not sure this is such a good idea. The test_dir is a fixed
> > filesystem designed to persiste between test harness runs to allow
> > testing on an aged filesystem.
> 
> Yes, and that's exactly what we want for the tests converted.

Well, that assertion is exactly what I'm disagreeing with. It
doesn't help me at all.

> > run the tests on a differently configured scratch device. I use this
> > all the time to change the filesystem config I'm testing against. By
> > moving all these tests to the TEST_DEV, these tests are no longer
> > run on the device that is configured specifically the way I want it
> > configured for the given test run.
> > 
> > So, I think this is a step backwards in terms of being able to
> > quickly iterate and cover different filesystem configurations, and
> > as such I don't really like it as a solution. What other options do
> > we have?
> 
> You can have different test devices, or simply not bother with aging
> it for every run.  You're missing the coverage of all the test dir
> using tests, which are a lot with the above version anyway.

IOWs, you're saying that you don't consider MKFS_OPTIONS as a first
class citizen. I've been using it for 7 or 8 years for exactly this
purpose - iterating testing of a change quickly across multiple
configurations without perturbing the long term aging of the test
device.

IOWs, taking 12 tests away from the scratch device significantly
reduces the coverage of my testing during development. It will
force me to have to change a fairly important part of my workflow -
a part that I haven't needed to change for several years.

I'll now need more VM image storage for the extra test devices I
need, I'll need multiple config files to handle the different test
filesystems, I'll need to write new scripts to mkfs the test devices
as well as setting the MKFS_OPTIONS for the scratch devices and
switch config files, etc.

I'm not opposed to making the change, just pointing out that
reducing the usage of the scratch device has a fairly significant
impact on test coverage for anyone who uses MKFS_OPTIONS in their
workflow...

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

Re: [PATCH 00/12] run more generic tests on TEST_DIR

[Christoph Hellwig]

On Fri, Dec 13, 2013 at 12:09:34PM +1100, Dave Chinner wrote:
> > You can have different test devices, or simply not bother with aging
> > it for every run.  You're missing the coverage of all the test dir
> > using tests, which are a lot with the above version anyway.
> 
> IOWs, you're saying that you don't consider MKFS_OPTIONS as a first
> class citizen. I've been using it for 7 or 8 years for exactly this
> purpose - iterating testing of a change quickly across multiple
> configurations without perturbing the long term aging of the test
> device.

But you're limiting yourself to the tests only using the scratch
device for that testing, leaving out all the ones using the TEST
directory.

> I'm not opposed to making the change, just pointing out that
> reducing the usage of the scratch device has a fairly significant
> impact on test coverage for anyone who uses MKFS_OPTIONS in their
> workflow...

It does have an impact for that particular workload, but I think that
workload is broken as you only test your specific config for those
tests using the scratch device, and do not get the coverage for the
tests using the test device.

git-grep -l TEST_DIR tests/generic/ | grep -v out | wc -l
65
git-grep -l TEST_DIR tests/xfs/ | grep -v out | wc -l 
23


hch@brick:~/work/xfstests$ git-grep -l _require_scratch tests/generic/ | wc -l
58
hch@brick:~/work/xfstests$ git-grep -l _require_scratch tests/xfs/ | wc -l
128

So you're missing close to 2/3s of the tests already.

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

Re: [PATCH 00/12] run more generic tests on TEST_DIR

[Dave Chinner]

On Fri, Dec 13, 2013 at 03:10:39AM -0800, Christoph Hellwig wrote:
> On Fri, Dec 13, 2013 at 12:09:34PM +1100, Dave Chinner wrote:
> > > You can have different test devices, or simply not bother with aging
> > > it for every run.  You're missing the coverage of all the test dir
> > > using tests, which are a lot with the above version anyway.
> > 
> > IOWs, you're saying that you don't consider MKFS_OPTIONS as a first
> > class citizen. I've been using it for 7 or 8 years for exactly this
> > purpose - iterating testing of a change quickly across multiple
> > configurations without perturbing the long term aging of the test
> > device.
> 
> But you're limiting yourself to the tests only using the scratch
> device for that testing, leaving out all the ones using the TEST
> directory.
> 
> > I'm not opposed to making the change, just pointing out that
> > reducing the usage of the scratch device has a fairly significant
> > impact on test coverage for anyone who uses MKFS_OPTIONS in their
> > workflow...
> 
> It does have an impact for that particular workload, but I think that
> workload is broken as you only test your specific config for those
> tests using the scratch device, and do not get the coverage for the
> tests using the test device.
> 
> git-grep -l TEST_DIR tests/generic/ | grep -v out | wc -l
> 65
> git-grep -l TEST_DIR tests/xfs/ | grep -v out | wc -l 
> 23
> 
> 
> hch@brick:~/work/xfstests$ git-grep -l _require_scratch tests/generic/ | wc -l
> 58
> hch@brick:~/work/xfstests$ git-grep -l _require_scratch tests/xfs/ | wc -l
> 128
> 
> So you're missing close to 2/3s of the tests already.

I think you got that the wrong way around: that's 2/3rds of the
tests (186) use the scratch device rather than the test device.
There's also roughly 100 tests (of ~160) in the quick group that use
the scratch device.

Hence doing smoke tests by simply changing the MKFS_OPTIONS gets a
significant amount of coverage *quickly*, and that's usually more
than sufficient to flush out bugs during development.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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