public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] xfstests: test different block sizes in a couple of tests
@ 2011-10-10  2:14 Dave Chinner
  2011-10-10  2:14 ` [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV Dave Chinner
  2011-10-10  2:14 ` [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems Dave Chinner
  0 siblings, 2 replies; 7+ messages in thread
From: Dave Chinner @ 2011-10-10  2:14 UTC (permalink / raw)
  To: xfs

Recently a problem was reported on test 225 when using a 512 byte
block size. I couldn't reproduce this problem using MKFS_OPTION="-b
size=512". The problem is that some tests use the TEST_DEV and
MKFS_OPTION only applies to the SCRATCH_DEV. To change the block
size of these tests, you need to specifically mkfs the TEST_DEV to
use those block sizes. This is not a typical test config - the
TEST_DEV is not supposed to be remade frequently, as it is designed
to be used for aging and testing aged filesystems.

Change a couple of tests that are testing hole/allocation patterns
to use the scratch device so that we get test coverage on multiple
block sizes, not just the default 4k block size filesystems.

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV
  2011-10-10  2:14 [PATCH 0/2] xfstests: test different block sizes in a couple of tests Dave Chinner
@ 2011-10-10  2:14 ` Dave Chinner
  2011-10-10 16:27   ` Christoph Hellwig
  2011-10-13 10:35   ` Alex Elder
  2011-10-10  2:14 ` [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems Dave Chinner
  1 sibling, 2 replies; 7+ messages in thread
From: Dave Chinner @ 2011-10-10  2:14 UTC (permalink / raw)
  To: xfs

From: Dave Chinner <dchinner@redhat.com>

Use the scratch device for test 225 so that both custom mkfs and
mount options impact the test (e.g. filesystem block size). This
exposes test failures when using 512 byte block sizes, which
currently not tested unless the test device is specifically created
with a 512 byte block size.

Also clean up the file names to include the test number, and don't
remove the test files after the test has finished so that it leaves
behind a corpse that can be dissected when the test fails.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 225 |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/225 b/225
index 76be888..e7f1d9c 100755
--- a/225
+++ b/225
@@ -45,20 +45,17 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_scratch
 
-_setup_testdir
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount > /dev/null 2>&1
 
-fiemapfile=$TEST_DIR/fiemap.$$
-fiemaplog=$TEST_DIR/fiemap.$$.log
+rm -f $seq.full
+fiemapfile=$SCRATCH_MNT/$seq.fiemap
+fiemaplog=$SCRATCH_MNT/$seq.log
 
-[ -x $here/src/fiemap-tester ] || _notrun "fiemap-tester not built"
 
-_cleanup()
-{
-	rm -f $fiemapfile
-	rm -f $fiemaplog
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+[ -x $here/src/fiemap-tester ] || _notrun "fiemap-tester not built"
 
 seed=`date +%s`
 
@@ -67,16 +64,16 @@ echo "using seed $seed" >> $fiemaplog
 echo "fiemap run without preallocation, with sync"
 $here/src/fiemap-tester -q -S -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog
 
-echo "fiemap run without preallocation or sync"
-$here/src/fiemap-tester -q -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog
-
-if grep -q "Operation not supported" $fiemaplog; then
-      _notrun "FIEMAP not supported by this filesystem type: $FSTYP"
+if [ $? -ne 0 ]; then
+	if grep -q "Operation not supported" $fiemaplog; then
+	      _notrun "FIEMAP not supported by this filesystem type: $FSTYP"
+	fi
+	status=$?
+	exit
 fi
 
-rm -f $fiemapfile
-rm -f $fiemaplog
-rm -f $seq.full
+echo "fiemap run without preallocation or sync"
+$here/src/fiemap-tester -q -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog
 
 status=0
 exit
-- 
1.7.5.4

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems
  2011-10-10  2:14 [PATCH 0/2] xfstests: test different block sizes in a couple of tests Dave Chinner
  2011-10-10  2:14 ` [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV Dave Chinner
@ 2011-10-10  2:14 ` Dave Chinner
  2011-10-10 16:27   ` Christoph Hellwig
  2011-10-13 10:35   ` Alex Elder
  1 sibling, 2 replies; 7+ messages in thread
From: Dave Chinner @ 2011-10-10  2:14 UTC (permalink / raw)
  To: xfs

From: Dave Chinner <dchinner@redhat.com>

The xfs_bmap output in the golden image is filesystem block size
dependent. Make all writes 64k to ensure that the allocation/hole
pattern is consistent across all supported filesystem block sizes.

Also, use the SCRATCH_DEV instead of the TEST_DEV so that we test
according to MKFS_OPTIONS rather than test on whatever setup the
TEST_DEV was created with.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 203     |   20 +-
 203.out |  832 +++++++++++++++++++++++++++++++-------------------------------
 2 files changed, 427 insertions(+), 425 deletions(-)

diff --git a/203 b/203
index be69dfa..6ca3c24 100755
--- a/203
+++ b/203
@@ -43,7 +43,7 @@ _write_holes()
 
 	offset=0
 	for i in `seq 0 $writes`; do
-		xfs_io -f $file -c "pwrite -q $offset 1"
+		xfs_io -f $file -c "pwrite -q $offset 64k"
 		let offset=$offset+0x100000
 	done
 }
@@ -52,18 +52,19 @@ _write_holes()
 #       1: [8..2047]: hole
 _filter_bmap()
 {
-	_filter_test_dir |
+	_filter_scratch |
 	awk '$3 ~ /hole/ { print $1, $2, $3; next }
              {print $1, $2; next}'
 }
 
 _cleanup()
 {
-	rm -f $TEST_DIR/hole_file*
-	rm -f $TEST_DIR/r??
+	rm -f $SCRATCH_DIR/r??
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
+rm -f $seq.full
+
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
@@ -71,19 +72,20 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
-
+_require_scratch
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount > /dev/null 2>&1
 
 for i in 10 14 15 16 17 28 29 30 31; do
-        rm -f $TEST_DIR/hole_file
-	_write_holes $TEST_DIR/hole_file${i} ${i}
+        rm -f $SCRATCH_MNT/hole_file
+	_write_holes $SCRATCH_MNT/hole_file${i} ${i}
 done
 
 for i in 10 14 15 16 17 28 29 30 31; do
-        xfs_bmap $TEST_DIR/hole_file${i} | _filter_bmap
+        xfs_bmap $SCRATCH_MNT/hole_file${i} | _filter_bmap
 	echo
 done
 
 # success, all done
 echo "*** done"
-rm -f $seq.full
 status=0
diff --git a/203.out b/203.out
index 1694457..ea5e966 100644
--- a/203.out
+++ b/203.out
@@ -1,427 +1,427 @@
 QA output created by 203
-TEST_DIR/hole_file10: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
+SCRATCH_MNT/hole_file10: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
 
-TEST_DIR/hole_file14: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
+SCRATCH_MNT/hole_file14: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
 
-TEST_DIR/hole_file15: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
+SCRATCH_MNT/hole_file15: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
 
-TEST_DIR/hole_file16: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
+SCRATCH_MNT/hole_file16: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
 
-TEST_DIR/hole_file17: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
-35: [34824..36863]: hole
-36: [36864..36871]:
+SCRATCH_MNT/hole_file17: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
+35: [34944..36863]: hole
+36: [36864..36991]:
 
-TEST_DIR/hole_file28: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
-35: [34824..36863]: hole
-36: [36864..36871]:
-37: [36872..38911]: hole
-38: [38912..38919]:
-39: [38920..40959]: hole
-40: [40960..40967]:
-41: [40968..43007]: hole
-42: [43008..43015]:
-43: [43016..45055]: hole
-44: [45056..45063]:
-45: [45064..47103]: hole
-46: [47104..47111]:
-47: [47112..49151]: hole
-48: [49152..49159]:
-49: [49160..51199]: hole
-50: [51200..51207]:
-51: [51208..53247]: hole
-52: [53248..53255]:
-53: [53256..55295]: hole
-54: [55296..55303]:
-55: [55304..57343]: hole
-56: [57344..57351]:
-57: [57352..59391]: hole
-58: [59392..59399]:
+SCRATCH_MNT/hole_file28: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
+35: [34944..36863]: hole
+36: [36864..36991]:
+37: [36992..38911]: hole
+38: [38912..39039]:
+39: [39040..40959]: hole
+40: [40960..41087]:
+41: [41088..43007]: hole
+42: [43008..43135]:
+43: [43136..45055]: hole
+44: [45056..45183]:
+45: [45184..47103]: hole
+46: [47104..47231]:
+47: [47232..49151]: hole
+48: [49152..49279]:
+49: [49280..51199]: hole
+50: [51200..51327]:
+51: [51328..53247]: hole
+52: [53248..53375]:
+53: [53376..55295]: hole
+54: [55296..55423]:
+55: [55424..57343]: hole
+56: [57344..57471]:
+57: [57472..59391]: hole
+58: [59392..59519]:
 
-TEST_DIR/hole_file29: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
-35: [34824..36863]: hole
-36: [36864..36871]:
-37: [36872..38911]: hole
-38: [38912..38919]:
-39: [38920..40959]: hole
-40: [40960..40967]:
-41: [40968..43007]: hole
-42: [43008..43015]:
-43: [43016..45055]: hole
-44: [45056..45063]:
-45: [45064..47103]: hole
-46: [47104..47111]:
-47: [47112..49151]: hole
-48: [49152..49159]:
-49: [49160..51199]: hole
-50: [51200..51207]:
-51: [51208..53247]: hole
-52: [53248..53255]:
-53: [53256..55295]: hole
-54: [55296..55303]:
-55: [55304..57343]: hole
-56: [57344..57351]:
-57: [57352..59391]: hole
-58: [59392..59399]:
-59: [59400..61439]: hole
-60: [61440..61447]:
+SCRATCH_MNT/hole_file29: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
+35: [34944..36863]: hole
+36: [36864..36991]:
+37: [36992..38911]: hole
+38: [38912..39039]:
+39: [39040..40959]: hole
+40: [40960..41087]:
+41: [41088..43007]: hole
+42: [43008..43135]:
+43: [43136..45055]: hole
+44: [45056..45183]:
+45: [45184..47103]: hole
+46: [47104..47231]:
+47: [47232..49151]: hole
+48: [49152..49279]:
+49: [49280..51199]: hole
+50: [51200..51327]:
+51: [51328..53247]: hole
+52: [53248..53375]:
+53: [53376..55295]: hole
+54: [55296..55423]:
+55: [55424..57343]: hole
+56: [57344..57471]:
+57: [57472..59391]: hole
+58: [59392..59519]:
+59: [59520..61439]: hole
+60: [61440..61567]:
 
-TEST_DIR/hole_file30: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
-35: [34824..36863]: hole
-36: [36864..36871]:
-37: [36872..38911]: hole
-38: [38912..38919]:
-39: [38920..40959]: hole
-40: [40960..40967]:
-41: [40968..43007]: hole
-42: [43008..43015]:
-43: [43016..45055]: hole
-44: [45056..45063]:
-45: [45064..47103]: hole
-46: [47104..47111]:
-47: [47112..49151]: hole
-48: [49152..49159]:
-49: [49160..51199]: hole
-50: [51200..51207]:
-51: [51208..53247]: hole
-52: [53248..53255]:
-53: [53256..55295]: hole
-54: [55296..55303]:
-55: [55304..57343]: hole
-56: [57344..57351]:
-57: [57352..59391]: hole
-58: [59392..59399]:
-59: [59400..61439]: hole
-60: [61440..61447]:
-61: [61448..63487]: hole
-62: [63488..63495]:
+SCRATCH_MNT/hole_file30: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
+35: [34944..36863]: hole
+36: [36864..36991]:
+37: [36992..38911]: hole
+38: [38912..39039]:
+39: [39040..40959]: hole
+40: [40960..41087]:
+41: [41088..43007]: hole
+42: [43008..43135]:
+43: [43136..45055]: hole
+44: [45056..45183]:
+45: [45184..47103]: hole
+46: [47104..47231]:
+47: [47232..49151]: hole
+48: [49152..49279]:
+49: [49280..51199]: hole
+50: [51200..51327]:
+51: [51328..53247]: hole
+52: [53248..53375]:
+53: [53376..55295]: hole
+54: [55296..55423]:
+55: [55424..57343]: hole
+56: [57344..57471]:
+57: [57472..59391]: hole
+58: [59392..59519]:
+59: [59520..61439]: hole
+60: [61440..61567]:
+61: [61568..63487]: hole
+62: [63488..63615]:
 
-TEST_DIR/hole_file31: 
-0: [0..7]:
-1: [8..2047]: hole
-2: [2048..2055]:
-3: [2056..4095]: hole
-4: [4096..4103]:
-5: [4104..6143]: hole
-6: [6144..6151]:
-7: [6152..8191]: hole
-8: [8192..8199]:
-9: [8200..10239]: hole
-10: [10240..10247]:
-11: [10248..12287]: hole
-12: [12288..12295]:
-13: [12296..14335]: hole
-14: [14336..14343]:
-15: [14344..16383]: hole
-16: [16384..16391]:
-17: [16392..18431]: hole
-18: [18432..18439]:
-19: [18440..20479]: hole
-20: [20480..20487]:
-21: [20488..22527]: hole
-22: [22528..22535]:
-23: [22536..24575]: hole
-24: [24576..24583]:
-25: [24584..26623]: hole
-26: [26624..26631]:
-27: [26632..28671]: hole
-28: [28672..28679]:
-29: [28680..30719]: hole
-30: [30720..30727]:
-31: [30728..32767]: hole
-32: [32768..32775]:
-33: [32776..34815]: hole
-34: [34816..34823]:
-35: [34824..36863]: hole
-36: [36864..36871]:
-37: [36872..38911]: hole
-38: [38912..38919]:
-39: [38920..40959]: hole
-40: [40960..40967]:
-41: [40968..43007]: hole
-42: [43008..43015]:
-43: [43016..45055]: hole
-44: [45056..45063]:
-45: [45064..47103]: hole
-46: [47104..47111]:
-47: [47112..49151]: hole
-48: [49152..49159]:
-49: [49160..51199]: hole
-50: [51200..51207]:
-51: [51208..53247]: hole
-52: [53248..53255]:
-53: [53256..55295]: hole
-54: [55296..55303]:
-55: [55304..57343]: hole
-56: [57344..57351]:
-57: [57352..59391]: hole
-58: [59392..59399]:
-59: [59400..61439]: hole
-60: [61440..61447]:
-61: [61448..63487]: hole
-62: [63488..63495]:
-63: [63496..65535]: hole
-64: [65536..65543]:
+SCRATCH_MNT/hole_file31: 
+0: [0..127]:
+1: [128..2047]: hole
+2: [2048..2175]:
+3: [2176..4095]: hole
+4: [4096..4223]:
+5: [4224..6143]: hole
+6: [6144..6271]:
+7: [6272..8191]: hole
+8: [8192..8319]:
+9: [8320..10239]: hole
+10: [10240..10367]:
+11: [10368..12287]: hole
+12: [12288..12415]:
+13: [12416..14335]: hole
+14: [14336..14463]:
+15: [14464..16383]: hole
+16: [16384..16511]:
+17: [16512..18431]: hole
+18: [18432..18559]:
+19: [18560..20479]: hole
+20: [20480..20607]:
+21: [20608..22527]: hole
+22: [22528..22655]:
+23: [22656..24575]: hole
+24: [24576..24703]:
+25: [24704..26623]: hole
+26: [26624..26751]:
+27: [26752..28671]: hole
+28: [28672..28799]:
+29: [28800..30719]: hole
+30: [30720..30847]:
+31: [30848..32767]: hole
+32: [32768..32895]:
+33: [32896..34815]: hole
+34: [34816..34943]:
+35: [34944..36863]: hole
+36: [36864..36991]:
+37: [36992..38911]: hole
+38: [38912..39039]:
+39: [39040..40959]: hole
+40: [40960..41087]:
+41: [41088..43007]: hole
+42: [43008..43135]:
+43: [43136..45055]: hole
+44: [45056..45183]:
+45: [45184..47103]: hole
+46: [47104..47231]:
+47: [47232..49151]: hole
+48: [49152..49279]:
+49: [49280..51199]: hole
+50: [51200..51327]:
+51: [51328..53247]: hole
+52: [53248..53375]:
+53: [53376..55295]: hole
+54: [55296..55423]:
+55: [55424..57343]: hole
+56: [57344..57471]:
+57: [57472..59391]: hole
+58: [59392..59519]:
+59: [59520..61439]: hole
+60: [61440..61567]:
+61: [61568..63487]: hole
+62: [63488..63615]:
+63: [63616..65535]: hole
+64: [65536..65663]:
 
 *** done
-- 
1.7.5.4

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV
  2011-10-10  2:14 ` [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV Dave Chinner
@ 2011-10-10 16:27   ` Christoph Hellwig
  2011-10-13 10:35   ` Alex Elder
  1 sibling, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2011-10-10 16:27 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

Looks good.

Reviewed-by: Christoph Hellwig <hch@lst.de>

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems
  2011-10-10  2:14 ` [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems Dave Chinner
@ 2011-10-10 16:27   ` Christoph Hellwig
  2011-10-13 10:35   ` Alex Elder
  1 sibling, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2011-10-10 16:27 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

On Mon, Oct 10, 2011 at 01:14:15PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> The xfs_bmap output in the golden image is filesystem block size
> dependent. Make all writes 64k to ensure that the allocation/hole
> pattern is consistent across all supported filesystem block sizes.
> 
> Also, use the SCRATCH_DEV instead of the TEST_DEV so that we test
> according to MKFS_OPTIONS rather than test on whatever setup the
> TEST_DEV was created with.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV
  2011-10-10  2:14 ` [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV Dave Chinner
  2011-10-10 16:27   ` Christoph Hellwig
@ 2011-10-13 10:35   ` Alex Elder
  1 sibling, 0 replies; 7+ messages in thread
From: Alex Elder @ 2011-10-13 10:35 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

On Mon, 2011-10-10 at 13:14 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> Use the scratch device for test 225 so that both custom mkfs and
> mount options impact the test (e.g. filesystem block size). This
> exposes test failures when using 512 byte block sizes, which
> currently not tested unless the test device is specifically created
> with a 512 byte block size.
> 
> Also clean up the file names to include the test number, and don't
> remove the test files after the test has finished so that it leaves
> behind a corpse that can be dissected when the test fails.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Looks good.

Reviewed-by: Alex Elder <aelder@sgi.com>


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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems
  2011-10-10  2:14 ` [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems Dave Chinner
  2011-10-10 16:27   ` Christoph Hellwig
@ 2011-10-13 10:35   ` Alex Elder
  1 sibling, 0 replies; 7+ messages in thread
From: Alex Elder @ 2011-10-13 10:35 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

On Mon, 2011-10-10 at 13:14 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> The xfs_bmap output in the golden image is filesystem block size
> dependent. Make all writes 64k to ensure that the allocation/hole
> pattern is consistent across all supported filesystem block sizes.
> 
> Also, use the SCRATCH_DEV instead of the TEST_DEV so that we test
> according to MKFS_OPTIONS rather than test on whatever setup the
> TEST_DEV was created with.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

A minor thing below, which I'll fix for you.
Also one question.  Otherwise looks good.

Reviewed-by: Alex Elder <aelder@sgi.com>

. . .
>  _cleanup()
>  {
> -	rm -f $TEST_DIR/hole_file*

You no longer delete the hole files because there's
no need to (because scratch will likely be clobbered
anyway)?

> -	rm -f $TEST_DIR/r??
> +	rm -f $SCRATCH_DIR/r??

SCRATCH_MNT

(This is an annoyance that ought to be fixed everywhere
I think--either make it SCRATCH_DIR or TEST_MNT.)

. . .


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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-10-13 10:35 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-10  2:14 [PATCH 0/2] xfstests: test different block sizes in a couple of tests Dave Chinner
2011-10-10  2:14 ` [PATCH 1/2] xfstests: make 225 use SCRATCH_DEV Dave Chinner
2011-10-10 16:27   ` Christoph Hellwig
2011-10-13 10:35   ` Alex Elder
2011-10-10  2:14 ` [PATCH 2/2] xfstests: make 203 pass on non-default block size filesystems Dave Chinner
2011-10-10 16:27   ` Christoph Hellwig
2011-10-13 10:35   ` Alex Elder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox