apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fstests: fix call sites that used xfs_io directly

Browse Source 
Convert those few remaining call sites to use the XFS_IO_PROG env var.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Amir Goldstein
2016-10-17 10:23:32 +03:00
committed by Eryu Guan
parent 16ef0843f2
commit 3fcfdba403
17 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/quota
+2 -2
View File
@@ -139,7 +139,7 @@ _file_as_id()
parent=`dirname $1`
if [ $3 = p ]; then
echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full
echo PARENT: $XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full
$XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$seqres.full 2>&1
magik='$>' # (irrelevent, above set projid-inherit-on-parent)
elif [ $3 = u ]; then
@@ -165,7 +165,7 @@ EOF
# exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$seqres.full 2>&1";
if [ $3 = p ]; then
echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full
echo PARENT: $XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full
$XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$seqres.full 2>&1
fi
}
common/rc
+2 -2
View File
@@ -3796,8 +3796,8 @@ init_rc()
exit 1
fi
# Figure out if we need to add -F ("foreign", deprecated) option to xfs_io
xfs_io -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" && \
export XFS_IO_PROG="$XFS_IO_PROG -F"
$XFS_IO_PROG -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" && \
export XFS_IO_PROG="$XFS_IO_PROG -F"
# xfs_copy doesn't work on v5 xfs yet without -d option
if [ "$FSTYP" == "xfs" ] && [[ $MKFS_OPTIONS =~ crc=1 ]]; then
tests/generic/043
+1 -1
View File
@@ -50,7 +50,7 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
tests/generic/044
+2 -2
View File
@@ -50,13 +50,13 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
exit
fi
xfs_io -c "truncate 64k" $file > /dev/null
$XFS_IO_PROG -c "truncate 64k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error truncating file $file
tests/generic/045
+2 -2
View File
@@ -50,13 +50,13 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 64k -S 0xff 0 64k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
exit
fi
xfs_io -c "truncate 32k" $file > /dev/null
$XFS_IO_PROG -c "truncate 32k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error truncating file $file
tests/generic/046
+2 -2
View File
@@ -50,13 +50,13 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 32k -S 0xff 0 32k" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 32k -S 0xff 0 32k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
exit
fi
xfs_io -c "truncate 64k" $file > /dev/null
$XFS_IO_PROG -c "truncate 64k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error truncating file $file
tests/generic/047
+1 -1
View File
@@ -81,7 +81,7 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 32k -S 0xff 0 32k" -c "fsync" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 32k -S 0xff 0 32k" -c "fsync" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
tests/generic/048
+1 -1
View File
@@ -84,7 +84,7 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 64k -S 0xff 0 10m" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 64k -S 0xff 0 10m" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
tests/generic/049
+1 -1
View File
@@ -81,7 +81,7 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
xfs_io -f -c "pwrite -b 32k -S 0xff 0 32k" $file > /dev/null
$XFS_IO_PROG -f -c "pwrite -b 32k -S 0xff 0 32k" $file > /dev/null
if [ $? -ne 0 ]
then
echo error creating/writing file $file
tests/generic/224
+2 -2
View File
@@ -59,7 +59,7 @@ _scratch_mount >> $seqres.full 2>&1
# set the reserved block pool to almost empty for XFS
if [ "$FSTYP" = "xfs" ]; then
xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seqres.full 2>&1
$XFS_IO_PROG -x -c "resblks 4" $SCRATCH_MNT >> $seqres.full 2>&1
fi
FILES=1000
@@ -71,7 +71,7 @@ for i in `seq 0 1 $FILES`; do
# tripped over.
(
sleep 5
xfs_io -f -c "truncate 10485760" $SCRATCH_MNT/testfile.$i
$XFS_IO_PROG -f -c "truncate 10485760" $SCRATCH_MNT/testfile.$i
dd if=/dev/zero of=$SCRATCH_MNT/testfile.$i bs=4k conv=notrunc
) > /dev/null 2>&1 &
done
tests/xfs/109
+2 -2
View File
@@ -50,7 +50,7 @@ populate()
i=0
while [ $i -le $files -a "X$faststart" = "X" ]; do
file=$SCRATCH_MNT/f$i
xfs_io -f -d -c 'pwrite -b 64k 0 64k' $file >/dev/null
$XFS_IO_PROG -f -d -c 'pwrite -b 64k 0 64k' $file >/dev/null
let i=$i+1
done
@@ -77,7 +77,7 @@ allocate()
{
j=0
while [ $j -lt 100 ]; do
xfs_io -f -c 'pwrite -b 64k 0 16m' $file \
$XFS_IO_PROG -f -c 'pwrite -b 64k 0 16m' $file \
>/dev/null 2>&1
rm $file
let j=$j+1
tests/xfs/114
+2 -2
View File
@@ -44,7 +44,7 @@ _check_paths()
sync; sleep 1
echo ""
echo "Check parent"
if ! xfs_io -x -c 'parent -c' $SCRATCH_MNT | _filter_num; then
if ! $XFS_IO_PROG -x -c 'parent -c' $SCRATCH_MNT | _filter_num; then
exit 1
fi
}
@@ -55,7 +55,7 @@ _print_names()
echo "Print out hardlink names for given path, $1"
echo ""
xfs_io -x -c parent $1 | awk '/p_ino.*=/ {$3 = "inodeXXX"; print; next} {print}'
$XFS_IO_PROG -x -c parent $1 | awk '/p_ino.*=/ {$3 = "inodeXXX"; print; next} {print}'
}
_test_create()
tests/xfs/190
+2 -2
View File
@@ -62,8 +62,8 @@ dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1
echo Punching holes in file
echo Punching holes in file >> $seqres.full
for i in $holes ; do
echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seqres.full
xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename ;
echo $XFS_IO_PROG -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seqres.full
$XFS_IO_PROG -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename ;
done
echo Verifying holes are in the correct spots:
tests/xfs/201
+1 -1
View File
@@ -56,7 +56,7 @@ do_pwrite()
end=`expr $2 \* $min_align`
length=`expr $end - $offset`
xfs_io -d -f $file -c "pwrite $offset $length" >/dev/null
$XFS_IO_PROG -d -f $file -c "pwrite $offset $length" >/dev/null
}
_require_scratch
tests/xfs/229
+1 -1
View File
@@ -60,7 +60,7 @@ EXTSIZE="256k"
mkdir ${TDIR}
# Set the test directory extsize
xfs_io -c "extsize ${EXTSIZE}" ${TDIR}
$XFS_IO_PROG -c "extsize ${EXTSIZE}" ${TDIR}
# Create a set of holey files
echo "generating ${NFILES} files"
tests/xfs/250
+1 -1
View File
@@ -81,7 +81,7 @@ _test_loop()
mount -t xfs -o loop $LOOP_DEV $LOOP_MNT
echo "*** preallocate large file"
xfs_io -f -c "resvsp 0 $fsize" $LOOP_MNT/foo | _filter_io
$XFS_IO_PROG -f -c "resvsp 0 $fsize" $LOOP_MNT/foo | _filter_io
echo "*** unmount loop filesystem"
umount $LOOP_MNT > /dev/null 2>&1
tests/xfs/291
+1 -1
View File
@@ -69,7 +69,7 @@ done
sync
# Soak up any remaining freespace
xfs_io -f -c "pwrite 0 16m" -c "fsync" $SCRATCH_MNT/space_file.large >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "pwrite 0 16m" -c "fsync" $SCRATCH_MNT/space_file.large >> $seqres.full 2>&1
# Take a look at freespace for any post-mortem on the test
_scratch_unmount