Modify golden output to match different Maximum file blocks for 32 & 64 bit systems

Merge of master-melb:xfs-cmds:29391a by kenmcd.

  enhanced the filter function

diff --git a/161 b/161
index a9f097f2faa48344af2dd70b5c1589ca1b5a8931..bdee02daf3791f771c63f7c768be59d609ce37db 100755 (executable)
--- a/161
+++ b/161
@@ -24,9 +24,10 @@ _cleanup()
     _cleanup_testdir
 }
 
-_filter_qa_file()
+_filter_get_allocinfo()
 {
-    sed -e "s#$qa_file#QA_FILE#"
+    $SED_PROG -e "s#$qa_file#QA_FILE#g" \
+             -e "s#18014398509481983\|34359738367#MAX_FILE_BLOCKS#g"
 }
 
 # get standard environment, filters and checks
@@ -46,9 +47,10 @@ qa_file=$SCRATCH_MNT/dmapi_hole_file
 
 dd if=/dev/zero bs=1024k count=3 of=$qa_file
 
-${DMAPI_QASUITE1_DIR}cmd/get_allocinfo $qa_file | _filter_qa_file
+${DMAPI_QASUITE1_DIR}cmd/get_allocinfo $qa_file | _filter_get_allocinfo
 ${DMAPI_QASUITE1_DIR}cmd/probe_hole -o 1048576 -l 0 $qa_file
-${DMAPI_QASUITE1_DIR}cmd/get_allocinfo $qa_file | _filter_qa_file
+${DMAPI_QASUITE1_DIR}cmd/punch_hole -o 1048576 -l 0 $qa_file
+${DMAPI_QASUITE1_DIR}cmd/get_allocinfo $qa_file | _filter_get_allocinfo
 
 status=0
 exit 

diff --git a/161.out b/161.out
index 54c994113e615196e9f6d829047538074ab8b5e3..1f096dc52ecd834d567a744ee61d2de1c05885db 100644 (file)
--- a/161.out
+++ b/161.out
@@ -4,9 +4,9 @@ QA output created by 161
 QA_FILE: starting offset 0
        returned 0, nelemp 2
        0: [0..6143]: resv
-       1: [6144..18014398509481983]: hole
+       1: [6144..MAX_FILE_BLOCKS]: hole
 roffp is 1048576, rlenp is 0
 QA_FILE: starting offset 0
        returned 0, nelemp 2
-       0: [0..6143]: resv
-       1: [6144..18014398509481983]: hole
+       0: [0..2047]: resv
+       1: [2048..MAX_FILE_BLOCKS]: hole