diff --git a/164 b/164 index 98b7d8c8..5f5657b6 100644 --- a/164 +++ b/164 @@ -42,10 +42,9 @@ _filter_io() # _filter_bmap() { - tee -a $seq.full |\ awk '$3 ~ /hole/ { print $1, $2, $3; next } $7 ~ /10000/ { print $1, $2, "unwritten"; next } - {print $1, $2}' + {print $1, $2}' >> $seq.full } @@ -60,29 +59,40 @@ _supported_fs xfs udf nfs _supported_os IRIX Linux testfile=$TEST_DIR/file.$seq -rm -f $testfile _test_eof_hole() { # on a BB boundary - xfs_io -f -c 'pwrite 0 50k' -c 'truncate 100k'\ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + rm -f $testfile + xfs_io -f -d \ + -c 'pwrite -b 50k 0 50k' \ + -c 'truncate 100k' \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" # on an odd byte boundary => 1 short of boundary + rm -f $testfile boundary_minus1=`expr 100 \* 1024 - 1` echo "boundary_minus1 = $boundary_minus1" - xfs_io -f -c 'pwrite 0 50k' -c "truncate $boundary_minus1" \ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + xfs_io -f -d \ + -c 'pwrite -b 50k 0 50k' \ + -c "truncate $boundary_minus1" \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" # on an odd byte boundary => 1 over boundary + rm -f $testfile echo "boundary_plus1 = $boundary_plus1" boundary_plus1=`expr 100 \* 1024 + 1` - xfs_io -f -c 'pwrite 0 50k' -c "truncate $boundary_plus1" \ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + xfs_io -f -d \ + -c 'pwrite -b 50k 0 50k' \ + -c "truncate $boundary_plus1" \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" } @@ -90,24 +100,39 @@ _test_eof_hole() _test_eof_unwritten_extent() { # on a BB boundary - xfs_io -f -c 'resvsp 0 100k' -c 'pwrite 0 50k' \ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + rm -f $testfile + xfs_io -f -d \ + -c 'resvsp 0 100k' \ + -c 'truncate 100k' \ + -c 'pwrite -b 50k 0 50k' \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" # on an odd byte boundary => 1 short of boundary + rm -f $testfile boundary_minus1=`expr 100 \* 1024 - 1` echo "boundary_minus1 = $boundary_minus1" - xfs_io -f -c "resvsp 0 $boundary_minus1" -c 'pwrite 0 50k' \ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + xfs_io -f -d \ + -c "resvsp 0 $boundary_minus1" \ + -c "truncate $boundary_minus1" \ + -c 'pwrite -b 50k 0 50k' \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" # on an odd byte boundary => 1 over boundary + rm -f $testfile boundary_plus1=`expr 100 \* 1024 + 1` echo "boundary_plus1 = $boundary_plus1" - xfs_io -f -c "resvsp 0 $boundary_plus1" -c 'pwrite 0 50k' \ - -c 'pread -b 200k 0 200k' $testfile | _filter_io + xfs_io -f -d \ + -c "resvsp 0 $boundary_plus1" \ + -c "truncate $boundary_plus1" \ + -c 'pwrite -b 50k 0 50k' \ + -c 'pread -b 200k 0 200k' \ + $testfile | _filter_io xfs_io -c 'bmap -vp' $testfile | _filter_bmap echo "" } diff --git a/164.out b/164.out index daef2952..51da2519 100644 --- a/164.out +++ b/164.out @@ -1,60 +1,35 @@ QA output created by 164 wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops +50 KiB, 1 ops read 102400/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..199]: hole boundary_minus1 = 102399 wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops +50 KiB, 1 ops read 102399/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..199]: hole boundary_plus1 = wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops +50 KiB, 1 ops read 102401/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..207]: hole wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops -read 102401/204800 bytes at offset 0 +50 KiB, 1 ops +read 102400/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..199]: unwritten boundary_minus1 = 102399 wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops -read 102401/204800 bytes at offset 0 +50 KiB, 1 ops +read 102399/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..199]: unwritten boundary_plus1 = 102401 wrote 51200/51200 bytes at offset 0 -50 KiB, 13 ops +50 KiB, 1 ops read 102401/204800 bytes at offset 0 100 KiB, 1 ops -/mnt/test/file.164: -EXT: FILE-OFFSET -0: [0..127]: -1: [128..199]: unwritten -2: [200..207]: unwritten diff --git a/165 b/165 index 7b3a42b5..df569f45 100644 --- a/165 +++ b/165 @@ -46,9 +46,8 @@ _filter_io() # _filter_bmap() { - tee -a $seq.full |\ awk '$3 ~ /hole/ { print $1, $2, $3; next } - {print $1, $2}' + {print $1, $2}' >> $seq.full } # get standard environment, filters and checks diff --git a/165.out b/165.out index 3ba54f75..e7c62137 100644 --- a/165.out +++ b/165.out @@ -1,58 +1,6 @@ QA output created by 165 wrote 40960/40960 bytes at offset 0 40 KiB, 10 ops -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..79]: -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..15]: -2: [16..23]: hole -3: [24..79]: -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..15]: -2: [16..23]: hole -3: [24..31]: -4: [32..39]: hole -5: [40..79]: -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..15]: -2: [16..23]: hole -3: [24..31]: -4: [32..39]: hole -5: [40..47]: -6: [48..55]: hole -7: [56..79]: -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..15]: -2: [16..23]: hole -3: [24..31]: -4: [32..39]: hole -5: [40..47]: -6: [48..55]: hole -7: [56..63]: -8: [64..71]: hole -9: [72..79]: -/mnt/test/file.165: -EXT: FILE-OFFSET -0: [0..7]: hole -1: [8..15]: -2: [16..23]: hole -3: [24..31]: -4: [32..39]: hole -5: [40..47]: -6: [48..55]: hole -7: [56..63]: -8: [64..71]: hole -9: [72..79]: *** offset = 0k ***