don't assume that the pagesize is 4K.

diff --git a/009 b/009
index f4aacbc0485a97f0a47615c771ac576e3aefe477..5b2b1c4445cfb2a20f09629b584cfe0420ee83ab 100755 (executable)
--- a/009
+++ b/009
@@ -46,6 +46,7 @@ here=`pwd`
 tmp=/tmp/$$
 status=1       # failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
+bsize=`$here/src/getpagesize`
 
 _cleanup()
 {
@@ -55,7 +56,9 @@ _cleanup()
 
 _block_filter()
 {
-   sed -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g'
+   sed \
+       -e 's/[0-9][0-9]*\.\.[0-9][0-9]*/BLOCKRANGE/g' \
+       -e "s/blocksize $bsize/blocksize BSIZE/g"
 }
 
 _init()
@@ -102,20 +105,20 @@ out=$SCRATCH_MNT/$$.tmp
 
 echo "*** test 1 - reservations cleared on O_TRUNC"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 r 0 1000b
 m
 EOF
 _filesize $out
 
-cat <<EOF | src/alloc -n -b 4096 -f $out -t | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out -t | _block_filter
 m
 EOF
 _filesize $out
 
 echo "*** test 2 - reserve & filesize"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 r 0 1000b
 EOF
 
@@ -123,7 +126,7 @@ _filesize $out
 
 echo "*** test 3 - alloc & filesize"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 a 1000b
 EOF
 
@@ -131,19 +134,19 @@ _filesize $out
 
 echo "*** test 4 - allocations cleared on O_TRUNC"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 a 1000b
 EOF
 _filesize $out
 
-cat <<EOF | src/alloc -n -b 4096 -f $out -t | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out -t | _block_filter
 m
 EOF
 _filesize $out
 
 echo "*** test 5 - reserve / unreserve"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 r 0 100b
 u 100b 500b
 m
@@ -153,7 +156,7 @@ EOF
 
 echo "*** test 6 - reserve adjacent"
 rm -f $out
-cat <<EOF | src/alloc -t -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -t -n -b $bsize -f $out | _block_filter
 r 0 100b
 r 100b 100b
 m
@@ -161,7 +164,7 @@ EOF
 
 echo "*** test 7 - alloc"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 a 1000b
 m
 a 2000b
@@ -172,7 +175,7 @@ _filesize $out
 
 echo "*** test 8 - alloc & truncate"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 a 1000b
 m
 t 500b
@@ -183,7 +186,7 @@ _filesize $out
 
 echo "*** test 9 - reserve & truncate"
 rm -f $out
-cat <<EOF | src/alloc -n -b 4096 -f $out | _block_filter
+cat <<EOF | src/alloc -n -b $bsize -f $out | _block_filter
 r 0 1000b
 m
 t 500b

diff --git a/009.out b/009.out
index 9a706ecc4de2218da71473e1935017dd7ab8e7e8..7132acaac66533f23b23374a8998c49d3f052f80 100644 (file)
--- a/009.out
+++ b/009.out
@@ -2,7 +2,7 @@ QA output created by 009
 *** mkfs
 *** mount
 *** test 1 - reservations cleared on O_TRUNC
-    blocksize 4096
+    blocksize BSIZE
     CMD resvsp, off=0, len=4096000
     MAP off=0, len=4096000 [0,1000]
         [ofs,count]: start..end
@@ -11,35 +11,35 @@ QA output created by 009
         [ofs,count]: start..end
         [0,1000]: BLOCKRANGE
 filesize = 0
-    blocksize 4096
+    blocksize BSIZE
     MAP off=0, len=-1 [0-]
         [ofs,count]: start..end
 filesize = 0
 *** test 2 - reserve & filesize
-    blocksize 4096
+    blocksize BSIZE
     CMD resvsp, off=0, len=4096000
     MAP off=0, len=4096000 [0,1000]
         [ofs,count]: start..end
         [0,1000]: BLOCKRANGE
 filesize = 0
 *** test 3 - alloc & filesize
-    blocksize 4096
+    blocksize BSIZE
     CMD allocsp, off=4096000, len=-1
     MAP off=4096000, len=-1 [1000-]
         [ofs,count]: start..end
 filesize = 4096000
 *** test 4 - allocations cleared on O_TRUNC
-    blocksize 4096
+    blocksize BSIZE
     CMD allocsp, off=4096000, len=-1
     MAP off=4096000, len=-1 [1000-]
         [ofs,count]: start..end
 filesize = 4096000
-    blocksize 4096
+    blocksize BSIZE
     MAP off=0, len=-1 [0-]
         [ofs,count]: start..end
 filesize = 0
 *** test 5 - reserve / unreserve
-    blocksize 4096
+    blocksize BSIZE
     CMD resvsp, off=0, len=409600
     MAP off=0, len=409600 [0,100]
         [ofs,count]: start..end
@@ -57,7 +57,7 @@ filesize = 0
         [ofs,count]: start..end
         [0,100]: BLOCKRANGE
 *** test 6 - reserve adjacent
-    blocksize 4096
+    blocksize BSIZE
     CMD resvsp, off=0, len=409600
     MAP off=0, len=409600 [0,100]
         [ofs,count]: start..end
@@ -70,7 +70,7 @@ filesize = 0
         [ofs,count]: start..end
         [0,200]: BLOCKRANGE
 *** test 7 - alloc
-    blocksize 4096
+    blocksize BSIZE
     CMD allocsp, off=4096000, len=-1
     MAP off=4096000, len=-1 [1000-]
         [ofs,count]: start..end
@@ -85,7 +85,7 @@ filesize = 0
         [0,2000]: BLOCKRANGE
 filesize = 8192000
 *** test 8 - alloc & truncate
-    blocksize 4096
+    blocksize BSIZE
     CMD allocsp, off=4096000, len=-1
     MAP off=4096000, len=-1 [1000-]
         [ofs,count]: start..end
@@ -98,7 +98,7 @@ filesize = 8192000
         [0,500]: BLOCKRANGE
 filesize = 2048000
 *** test 9 - reserve & truncate
-    blocksize 4096
+    blocksize BSIZE
     CMD resvsp, off=0, len=4096000
     MAP off=0, len=4096000 [0,1000]
         [ofs,count]: start..end