xfs
[Top] [All Lists]

[PATCH] xfstests: generic/314 filter out total from ls -l output

To: <linux-btrfs@xxxxxxxxxxxxxxx>, <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfstests: generic/314 filter out total from ls -l output
From: Josef Bacik <jbacik@xxxxxxxxxxxx>
Date: Fri, 26 Jul 2013 11:45:32 -0400
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1374853534; bh=seOkyr22vrGf+28faSudHcOM3MfWKZC7iTqZLQfqqT4=; h=From:To:Subject:Date; b=cWhU6+YxZGVLCuj9CWLUl8rC+uKLTCvjuIi9BYGTpmnbuiGkzC0AVPuGfl0cl+kWI Rrf/80g34An7KEC+uihh2kGoJ+1Vy6o4Q1qbsz4Y/jl0v/OJh3kzJhznM5FZKV/qVG Ej9I2p2OXp5peut/lgISk8wWmis0sGQ58eBNiW2U=
ls -l will show the nblocks for the directory, and this made it into the golden
output for 314.  The problem is nblocks is 0 for btrfs directories because we're
awesome, which makes us fail this test.  So filter out the "total blah" line of
ls -l so btrfs can pass this test too.  Thanks,

Signed-off-by: Josef Bacik <jbacik@xxxxxxxxxxxx>
---
 tests/generic/314     |    2 +-
 tests/generic/314.out |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/tests/generic/314 b/tests/generic/314
index 2d34ea8..0dd98a3 100644
--- a/tests/generic/314
+++ b/tests/generic/314
@@ -62,7 +62,7 @@ su $qa_user -c "setfacl -m u:$qa_user:rwx,d:u:$qa_user:rwx 
$TEST_DIR/$seq-dir"
 su $qa_user -c "mkdir $TEST_DIR/$seq-dir/subdir2"
 
 # Both subdirs should have inherited sgid
-_ls_l $TEST_DIR/$seq-dir/ | _filter_test_dir | awk '{print $1,$NF}'
+_ls_l $TEST_DIR/$seq-dir/ | grep -v total | _filter_test_dir | awk '{print 
$1,$NF}'
 
 status=0
 exit
diff --git a/tests/generic/314.out b/tests/generic/314.out
index 180be80..b2db82b 100644
--- a/tests/generic/314.out
+++ b/tests/generic/314.out
@@ -1,4 +1,3 @@
 QA output created by 314
-total 4
 drwxr-sr-x subdir
 drwxrwsr-x+ subdir2
-- 
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>