From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:53136 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbbCREOS (ORCPT ); Wed, 18 Mar 2015 00:14:18 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2I4EIdC004115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 18 Mar 2015 00:14:18 -0400 From: Eryu Guan Subject: [PATCH v2] xfs/014: replace df with $DF_PROG Date: Wed, 18 Mar 2015 12:14:01 +0800 Message-Id: <1426652041-1265-1-git-send-email-eguan@redhat.com> In-Reply-To: <1425914923-19220-1-git-send-email-eguan@redhat.com> References: <1425914923-19220-1-git-send-email-eguan@redhat.com> Sender: fstests-owner@vger.kernel.org To: fstests@vger.kernel.org Cc: Eryu Guan List-ID: 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 Appending '-P' option to df fixes this issue. So use $DF_PROG which already has -P option set. $DF_PROG also sets -T option to print fs type in extra column, so change the awk command accordingly to get the correct freespace. Also replace awk with $AWK_PROG. Signed-off-by: Eryu Guan --- v2: address Dave's comments - use $DF_PROG not "df -P" - update awk arguments to get correct freespace, as $DF_PROG prints fs type too - use $AWK_PROG not awk tests/xfs/014 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/014 b/tests/xfs/014 index 8866bfe..ab3d85b 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_PROG -m $dir | $AWK_PROG '/^\// { print $5 - 10 }'` $XFS_IO_PROG -f -c "falloc 0 ${freesp}M" $dir/spc } -- 1.8.3.1