| Message ID | 1425914923-19220-1-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 09, 2015 at 11:28:43PM +0800, Eryu Guan wrote: > I've seen xfs/014 fails as > > [root@dhcp-66-86-3 xfstests]# diff -u tests/xfs/014.out /var/lib/xfstests/results//xfs/014.out.bad > --- tests/xfs/014.out 2015-03-06 14:48:19.000000000 +0800 > +++ /var/lib/xfstests/results//xfs/014.out.bad 2015-03-09 > 22:48:08.660001935 +0800 > @@ -1,2 +1,9 @@ > QA output created by 014 > Silence is golden. > +falloc: invalid option -- '1' > +falloc: invalid option -- '0' > +falloc: invalid option -- 'M' > +falloc [-k] off len -- allocates space associated with part of a file > via fallocate > +falloc [-k] off len -- allocates space associated with part of a file > via fallocate > +falloc [-k] off len -- allocates space associated with part of a file > via fallocate > +falloc [-k] off len -- allocates space associated with part of a file > via fallocate > > which is because output of "df -m" is split into two lines, and > freesp is 0, in _consume_free_space() function. > > Filesystem 1M-blocks Used Available Use% Mounted on > /mnt/testarea/scratch/014.fs > 10230 1061 9170 11% /mnt/testarea/scratch/014.mnt > > Now use the POSIX output format of df to make it more portable. > > Signed-off-by: Eryu Guan <eguan@redhat.com> > --- > tests/xfs/014 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/xfs/014 b/tests/xfs/014 > index 8866bfe..a2069db 100755 > --- a/tests/xfs/014 > +++ b/tests/xfs/014 > @@ -88,7 +88,7 @@ _consume_free_space() > dir=$1 > > # allocate all but 10MB of available space > - freesp=`df -m $dir | awk '/^\// { print $4 - 10 }'` > + freesp=`df -mP $dir | awk '/^\// { print $4 - 10 }'` > $XFS_IO_PROG -f -c "falloc 0 ${freesp}M" $dir/spc $DF_PROG. from common/config: export DF_PROG="`set_prog_path df`" [ "$DF_PROG" = "" ] && _fatal "df not found" [ "$HOSTOS" = "Linux" ] && export DF_PROG="$DF_PROG -T -P" Cheers, Dave.
diff --git a/tests/xfs/014 b/tests/xfs/014 index 8866bfe..a2069db 100755 --- a/tests/xfs/014 +++ b/tests/xfs/014 @@ -88,7 +88,7 @@ _consume_free_space() dir=$1 # allocate all but 10MB of available space - freesp=`df -m $dir | awk '/^\// { print $4 - 10 }'` + freesp=`df -mP $dir | awk '/^\// { print $4 - 10 }'` $XFS_IO_PROG -f -c "falloc 0 ${freesp}M" $dir/spc }
I've seen xfs/014 fails as [root@dhcp-66-86-3 xfstests]# diff -u tests/xfs/014.out /var/lib/xfstests/results//xfs/014.out.bad --- tests/xfs/014.out 2015-03-06 14:48:19.000000000 +0800 +++ /var/lib/xfstests/results//xfs/014.out.bad 2015-03-09 22:48:08.660001935 +0800 @@ -1,2 +1,9 @@ QA output created by 014 Silence is golden. +falloc: invalid option -- '1' +falloc: invalid option -- '0' +falloc: invalid option -- 'M' +falloc [-k] off len -- allocates space associated with part of a file via fallocate +falloc [-k] off len -- allocates space associated with part of a file via fallocate +falloc [-k] off len -- allocates space associated with part of a file via fallocate +falloc [-k] off len -- allocates space associated with part of a file via fallocate which is because output of "df -m" is split into two lines, and freesp is 0, in _consume_free_space() function. Filesystem 1M-blocks Used Available Use% Mounted on /mnt/testarea/scratch/014.fs 10230 1061 9170 11% /mnt/testarea/scratch/014.mnt Now use the POSIX output format of df to make it more portable. Signed-off-by: Eryu Guan <eguan@redhat.com> --- tests/xfs/014 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)