From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id p4JBmKgj032866 for ; Thu, 19 May 2011 06:48:21 -0500 Received: from mx1.suse.de (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id A40151E2EF28 for ; Thu, 19 May 2011 04:48:20 -0700 (PDT) Received: from mx1.suse.de (cantor.suse.de [195.135.220.2]) by cuda.sgi.com with ESMTP id JrFG1ph9sVK6Rr6h for ; Thu, 19 May 2011 04:48:20 -0700 (PDT) From: Jan Kara Subject: [PATCH] xfstests: Improve test 219 to work with different filesystems Date: Thu, 19 May 2011 13:47:55 +0200 Message-Id: <1305805675-13753-1-git-send-email-jack@suse.cz> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com Cc: Jan Kara Different filesystems account different amount of metadata in quota. Thus it is impractical to check for a particular amount of space occupied by a file because there is no right value. Change the test to verify whether the amount of space is between the expected amount of space and the expected amount +5%. The number of files is checked exactly as previously. Signed-off-by: Jan Kara --- 219 | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) Dave, does this look better? diff --git a/219 b/219 index 836d703..ad4e64d 100755 --- a/219 +++ b/219 @@ -58,6 +58,23 @@ test_files() done } +check_usage() +{ + wroteblocks=$1 + wrotefiles=$2 + read id exceed blocks bsoft bhard inodes isoft ihard + if [ "$blocks" -lt "$wroteblocks" ]; then + echo "Too few blocks used (type=$type)" + # Save 5% for overhead of metadata or different block size + elif [ "$blocks" -gt $((wroteblocks+wroteblocks/20)) ]; then + echo "Too many blocks used (type=$type)" + elif [ "$inodes" != "$wrotefiles" ]; then + echo "Bad number of inodes used (type=$type)" + else + echo "Usage OK (type=$type)" + fi +} + test_accounting() { echo "### some controlled buffered, direct and mmapd IO (type=$type)" @@ -77,8 +94,12 @@ test_accounting() $here/src/lstat64 $file | head -3 | _filter_scratch done - repquota -$type -n $SCRATCH_MNT | grep -v "^#0" | _filter_scratch | - awk '/^#/ { if (seen[$1]) next; seen[$1]++; } { print; }' + if [ $type == 'u' ]; then + id=$uid + else + id=$gid + fi + repquota -$type -n $SCRATCH_MNT | grep "^#$id" | check_usage 144 3 } # real QA test starts here -- 1.7.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs