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

xfstests: added -P option to $DF_PROG

Browse Source 
Added -P option to $DF_PROG and changed the invocation of
'df' command in generic/{251,260,273,275} testcases
with $DF_PROG.

Otherwise the testcases will fail if the scratch
device has a long name (for example, if it's an LVM volume).
Because df outputs its usage stats with two lines:

/dev/mapper/xfstests-disk1
                       3030800      4608   2868908   1% /tmp/mnt/disk1

Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Stanislav Kholmanskikh
2013-10-29 09:25:24 +00:00
committed by Rich Johnston
parent efbdf561bd
commit bfdd1e72b3
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+1 -1
View File
@@ -151,7 +151,7 @@ export PS_ALL_FLAGS="-ef"
export DF_PROG="`set_prog_path df`" export DF_PROG="`set_prog_path df`"
[ "$DF_PROG" = "" ] && _fatal "df not found" [ "$DF_PROG" = "" ] && _fatal "df not found"
[ "$HOSTOS" = "Linux" ] && export DF_PROG="$DF_PROG -T" [ "$HOSTOS" = "Linux" ] && export DF_PROG="$DF_PROG -T -P"
export XFS_LOGPRINT_PROG="`set_prog_path xfs_logprint`" export XFS_LOGPRINT_PROG="`set_prog_path xfs_logprint`"
export XFS_REPAIR_PROG="`set_prog_path xfs_repair`" export XFS_REPAIR_PROG="`set_prog_path xfs_repair`"
tests/generic/251
+1 -1
View File
@@ -89,7 +89,7 @@ _guess_max_minlen()
fstrim_loop() fstrim_loop()
{ {
trap "_destroy_fstrim; exit \$status" 2 15 trap "_destroy_fstrim; exit \$status" 2 15
fsize=$(df | grep $SCRATCH_MNT | grep $SCRATCH_DEV | awk '{print $2}') fsize=$($DF_PROG | grep $SCRATCH_MNT | grep $SCRATCH_DEV | awk '{print $3}')
mmlen=$(_guess_max_minlen) mmlen=$(_guess_max_minlen)
while true ; do while true ; do
tests/generic/260
+1 -1
View File
@@ -48,7 +48,7 @@ _scratch_mount
_test_batched_discard $SCRATCH_MNT || _notrun "FITRIM not supported on $SCRATCH_DEV" _test_batched_discard $SCRATCH_MNT || _notrun "FITRIM not supported on $SCRATCH_DEV"
fssize=$(df -k | grep "$SCRATCH_MNT" | grep "$SCRATCH_DEV" | awk '{print $2}') fssize=$($DF_PROG -k | grep "$SCRATCH_MNT" | grep "$SCRATCH_DEV" | awk '{print $3}')
beyond_eofs=$(_math "$fssize*2048") beyond_eofs=$(_math "$fssize*2048")
max_64bit=$(_math "2^64 - 1") max_64bit=$(_math "2^64 - 1")
tests/generic/273
+1 -1
View File
@@ -68,7 +68,7 @@ _file_create()
cd $SCRATCH_MNT/origin cd $SCRATCH_MNT/origin
_disksize=`df --block-size=1 $SCRATCH_DEV | awk -v sd=$SCRATCH_DEV 'BEGIN{c=0}{for(i=1;i<=NF;++i){a[c]=$i;++c}}END{for(entry in a){if(a[entry] ~ sd){print a[entry + 3]; break}}}'` _disksize=`$DF_PROG --block-size=1 $SCRATCH_DEV | awk -v sd=$SCRATCH_DEV 'BEGIN{c=0}{for(i=1;i<=NF;++i){a[c]=$i;++c}}END{for(entry in a){if(a[entry] ~ sd){print a[entry + 3]; break}}}'`
_disksize=$(($_disksize / 3)) _disksize=$(($_disksize / 3))
_num=$(($_disksize / $count / $threads / 4096)) _num=$(($_disksize / $count / $threads / 4096))
_count=$count _count=$count
tests/generic/275
+3 -3
View File
@@ -69,14 +69,14 @@ sync
dd if=/dev/zero of=$SCRATCH_MNT/tmp4 bs=4K oflag=sync >>$seqres.full 2>&1 dd if=/dev/zero of=$SCRATCH_MNT/tmp4 bs=4K oflag=sync >>$seqres.full 2>&1
# Save space usage info to the full file # Save space usage info to the full file
echo "Pre rm space:" >> $seqres.full echo "Pre rm space:" >> $seqres.full
df $SCRATCH_MNT >>$seqres.full 2>&1 $DF_PROG $SCRATCH_MNT >>$seqres.full 2>&1
# Should leave approx 256k free # Should leave approx 256k free
rm -f $SCRATCH_MNT/tmp1 rm -f $SCRATCH_MNT/tmp1
sync sync
echo "Post rm space:" >> $seqres.full echo "Post rm space:" >> $seqres.full
df $SCRATCH_MNT >>$seqres.full 2>&1 $DF_PROG $SCRATCH_MNT >>$seqres.full 2>&1
_freespace=`df -k $SCRATCH_MNT | tail -n 1 | awk '{print $4}'` _freespace=`$DF_PROG -k $SCRATCH_MNT | tail -n 1 | awk '{print $5}'`
[ $_freespace -gt 1024 ] && _fail "could not sufficiently fill filesystem" [ $_freespace -gt 1024 ] && _fail "could not sufficiently fill filesystem"
# Try a write larger than available space # Try a write larger than available space