From: David Chinner <dgc@sgi.com>
To: xfs-dev <xfs-dev@sgi.com>
Cc: xfs-oss <xfs@oss.sgi.com>
Subject: [PATCH, XFSQA] Use XFS_IO_PROG in 164 and 165
Date: Wed, 23 Apr 2008 11:57:13 +1000 [thread overview]
Message-ID: <20080423015713.GL103491721@sgi.com> (raw)
We should be using $XFS_IO_PROG rather than calling the binary
directly and assuming that the path is picking up the right test binary.
Signed-off-by: Dave Chinner <dgc@sgi.com>
---
xfstests/164 | 24 ++++++++++++------------
xfstests/165 | 16 ++++++++--------
2 files changed, 20 insertions(+), 20 deletions(-)
Index: xfs-cmds/xfstests/164
===================================================================
--- xfs-cmds.orig/xfstests/164 2007-08-24 14:19:48.000000000 +1000
+++ xfs-cmds/xfstests/164 2008-04-23 11:53:31.821494444 +1000
@@ -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 ""
}
Index: xfs-cmds/xfstests/165
===================================================================
--- xfs-cmds.orig/xfstests/165 2007-04-20 20:28:54.000000000 +1000
+++ xfs-cmds/xfstests/165 2008-04-23 11:53:56.350340350 +1000
@@ -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
next reply other threads:[~2008-04-23 1:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-23 1:57 David Chinner [this message]
2008-04-23 4:44 ` [PATCH, XFSQA] Use XFS_IO_PROG in 164 and 165 Barry Naujok
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080423015713.GL103491721@sgi.com \
--to=dgc@sgi.com \
--cc=xfs-dev@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox