fix pagesizes used for direct IO randholes run, add missing filter.

diff --git a/008 b/008
index 0b71cb399d0075d027c3edfef83763fe2d9d850e..dbbcb28d867e34a4c8a7938e3fff6bd046d63f02 100755 (executable)
--- a/008
+++ b/008
@@ -45,6 +45,7 @@ echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=0       # success is the default!
+pgsize=`$here/src/getpagesize`
 trap "rm -f $tmp.*; _cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
@@ -52,6 +53,11 @@ _cleanup()
     rm -rf $TEST_DIR/randholes.$$.*
 }
 
+_filter()
+{
+    sed -e "s/-b $pgsize/-b PGSIZE/g"
+}
+
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
@@ -66,7 +72,7 @@ _do_test()
     echo ""
     echo "randholes.$_n : $_param"
     echo "------------------------------------------"
-    if $here/src/randholes $_param $out >$tmp.out
+    if $here/src/randholes $_param $out | _filter >$tmp.out
     then
         # quick check - how many holes did we get?
         count=`xfs_bmap $out | egrep -c ': hole'`
@@ -90,16 +96,14 @@ _do_test()
 
 rm -f $here/$seq.out.full
 
-pgsize=`$here/src/getpagesize`
-
 _do_test 1 50 "-l 5000000 -c 50 -b $pgsize"
 _do_test 2 100 "-l 10000000 -c 100 -b $pgsize"
 _do_test 3 100 "-l 10000000 -c 100 -b 512"   # test partial pages
 
 # rinse, lather, repeat for direct IO
-_do_test 1 50 "-d -l 5000000 -c 50 -b $pgsize"
-_do_test 2 100 "-d -l 10000000 -c 100 -b $pgsize"
-_do_test 3 100 "-d -l 10000000 -c 100 -b 512"   # test partial pages
+_do_test 4 50 "-d -l 5000000 -c 50 -b $pgsize"
+_do_test 5 100 "-d -l 10000000 -c 100 -b $pgsize"
+# note: direct IO requires page aligned IO
 
 # todo: realtime.
 

diff --git a/008.out b/008.out
index 5f929a4d3faca8d5663346a4030691937a87b0c6..c8a7b584202c9fdc9ec976c9d45cf1cda7716e52 100644 (file)
--- a/008.out
+++ b/008.out
@@ -19,7 +19,3 @@ holes is in range
 randholes.5 : -d -l 10000000 -c 100 -b PGSIZE
 ------------------------------------------
 holes is in range
-
-randholes.6 : -d -l 10000000 -c 100 -b 512
-------------------------------------------
-holes is in range