From f2c8cf5b3a94cafc8043c89b487d0ce7b1624f18 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Fri, 26 Jul 2013 11:45:32 -0400 Subject: [PATCH] xfstests: generic/314 filter out total from ls -l output 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 Reviewed-by: Eric Sandeen Signed-off-by: Ben Myers --- tests/generic/314 | 2 +- tests/generic/314.out | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/generic/314 b/tests/generic/314 index 2d34ea86..0dd98a36 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 180be809..b2db82be 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 -- 2.39.5