From: Dave Chinner <dgc@sgi.com>
Date: Mon, 28 Apr 2008 06:26:10 +0000 (+0000)
Subject: Use configured XFS_IO_PROG binary
X-Git-Tag: v1.1.0~394
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=168ee563f63000f84987d0d8d17afaffb05516e8;p=xfstests-dev.git

Use configured XFS_IO_PROG binary

We should use XFS_IO_PROG variable rather than calling xfs_io
directly and relying on teh path to pick up the correct binary
for the test.
Merge of master-melb:xfs-cmds:30993a by kenmcd.

  Use XFS_IO_PROG, not xfs_io.
---

diff --git a/164 b/164
index 7efba593..84e4e28e 100644
--- a/164
+++ b/164
@@ -64,36 +64,36 @@ _test_eof_hole()
 {
 	# on a BB boundary
 	rm -f $testfile
-	xfs_io -f -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -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 -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -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 -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -c 'bmap -vp' $testfile | _filter_bmap
 	echo ""
 }
 
@@ -101,39 +101,39 @@ _test_eof_unwritten_extent()
 {
 	# on a BB boundary
 	rm -f $testfile
-	xfs_io -f -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -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 -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -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 -d \
+	$XFS_IO_PROG -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  
+	$XFS_IO_PROG -c 'bmap -vp' $testfile | _filter_bmap
 	echo ""
 }
 
diff --git a/165 b/165
index df569f45..9eda6089 100644
--- a/165
+++ b/165
@@ -68,10 +68,10 @@ len=4
 end=`expr 10 \* $len`
 
 # Other test...
-#xfs_io -f -c "resvsp ${off}k ${end}k" $testfile
+#$XFS_IO_PROG -f -c "resvsp ${off}k ${end}k" $testfile
 
 # write the initial file
-xfs_io -f -c "pwrite 0  ${end}k" $testfile | _filter_io
+$XFS_IO_PROG -f -c "pwrite 0  ${end}k" $testfile | _filter_io
 
 
 off=0
@@ -80,7 +80,7 @@ do
 	offset=${off}k
 	length=${len}k
 
-	xfs_io -c "unresvsp $offset $length" -c "bmap -vp" $testfile | _filter_bmap
+	$XFS_IO_PROG -c "unresvsp $offset $length" -c "bmap -vp" $testfile | _filter_bmap
 
 	off=`expr $off + $len` # skip over 1
 	off=`expr $off + $len`
@@ -97,18 +97,18 @@ do
 	echo ""
 
 	# prealloc and write
-	xfs_io -d -c "resvsp $offset $length" -c "pwrite -b $bufsize $offset $length" $testfile | _filter_io
+	$XFS_IO_PROG -d -c "resvsp $offset $length" -c "pwrite -b $bufsize $offset $length" $testfile | _filter_io
 
 	# Other tests...
-	#xfs_io -c "resvsp $offset $length" $testfile
+	#$XFS_IO_PROG -c "resvsp $offset $length" $testfile
 	#xfs_bmap -v -p $testfile
-	#xfs_io -d -c "pwrite -b $bufsize $offset $length" $testfile
+	#$XFS_IO_PROG -d -c "pwrite -b $bufsize $offset $length" $testfile
 	#xfs_bmap -v -p $testfile
 
-	xfs_io -r -c "pread -v -b $bufsize $offset $length" $testfile >$tmp.$off &
+	$XFS_IO_PROG -r -c "pread -v -b $bufsize $offset $length" $testfile >$tmp.$off &
 
 	# Other tests...
-	#xfs_io -r -c "pread -v -b $bufsize $offset $length" $testfile
+	#$XFS_IO_PROG -r -c "pread -v -b $bufsize $offset $length" $testfile
         #sleep 5
 
 	off=`expr $off + $len` # skip over 1