From: Eric Sandeen <sandeen@sandeen.net>
To: Josef Bacik <jbacik@fusionio.com>
Cc: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH] xfstests: generic/314 filter out total from ls -l output
Date: Fri, 26 Jul 2013 10:58:06 -0500 [thread overview]
Message-ID: <51F29C8E.2070102@sandeen.net> (raw)
In-Reply-To: <1374853532-19253-1-git-send-email-jbacik@fusionio.com>
On 7/26/13 10:45 AM, Josef Bacik wrote:
> 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@fusionio.com>
I don't know for sure that that makes brtfs awesome ;), but its' not what
we're testing here, so ignoring it seems reasonable.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> ---
> 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
>
WARNING: multiple messages have this Message-ID (diff)
From: Eric Sandeen <sandeen@sandeen.net>
To: Josef Bacik <jbacik@fusionio.com>
Cc: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH] xfstests: generic/314 filter out total from ls -l output
Date: Fri, 26 Jul 2013 10:58:06 -0500 [thread overview]
Message-ID: <51F29C8E.2070102@sandeen.net> (raw)
In-Reply-To: <1374853532-19253-1-git-send-email-jbacik@fusionio.com>
On 7/26/13 10:45 AM, Josef Bacik wrote:
> 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@fusionio.com>
I don't know for sure that that makes brtfs awesome ;), but its' not what
we're testing here, so ignoring it seems reasonable.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> ---
> 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
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-07-26 16:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 15:45 [PATCH] xfstests: generic/314 filter out total from ls -l output Josef Bacik
2013-07-26 15:45 ` Josef Bacik
2013-07-26 15:58 ` Eric Sandeen [this message]
2013-07-26 15:58 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51F29C8E.2070102@sandeen.net \
--to=sandeen@sandeen.net \
--cc=jbacik@fusionio.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.