From: Theodore Ts'o <tytso@mit.edu>
To: xfs@oss.sgi.com
Cc: Ext4 Developers List <linux-ext4@vger.kernel.org>,
Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 3/3] generic/237: fix filtering for expected failure message
Date: Sat, 12 Apr 2014 18:55:17 -0400 [thread overview]
Message-ID: <1397343317-14669-4-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1397343317-14669-1-git-send-email-tytso@mit.edu>
Newer kernels return EACCES instead of EPERM when modifying an acl
fails. Update the filtering to handle this.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
tests/generic/237 | 2 +-
tests/generic/237.out | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/generic/237 b/tests/generic/237
index 6a61ec8..b068150 100755
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -68,7 +68,7 @@ touch file1
chown $acl1.$acl1 file1
echo "Expect to FAIL"
-$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | sed 's/^setfacl: \/.*file1: Operation not permitted$/setfacl: file1: Operation not permitted/'
+$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | sed -e 's/Permission denied/Operation not permitted/' -e 's/file1: //' -e 's,[/a-zA-Z]*setfacl: ,setfacl: ,'
echo "Test over."
# success, all done
diff --git a/tests/generic/237.out b/tests/generic/237.out
index 09d98c6..4edafa6 100644
--- a/tests/generic/237.out
+++ b/tests/generic/237.out
@@ -1,4 +1,4 @@
QA output created by 237
Expect to FAIL
-setfacl: file1: Operation not permitted
+setfacl: Operation not permitted
Test over.
--
1.9.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-04-12 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-12 22:55 [PATCH] ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode Theodore Ts'o
2014-04-12 22:55 ` [PATCH 1/3] generic/004: fix filtering of expected error message Theodore Ts'o
2014-04-13 4:06 ` Eric Sandeen
2014-04-12 22:55 ` [PATCH 2/3] generic/022: update expected output after the test was renamed Theodore Ts'o
2014-04-13 4:07 ` Eric Sandeen
2014-04-12 22:55 ` Theodore Ts'o [this message]
2014-04-13 8:17 ` [PATCH 3/3] generic/237: fix filtering for expected failure message Christoph Hellwig
2014-04-13 12:43 ` Theodore Ts'o
2014-04-14 0:14 ` Dave Chinner
2014-04-15 2:08 ` Theodore Ts'o
2014-04-12 23:03 ` [PATCH] ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode Theodore Ts'o
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=1397343317-14669-4-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-ext4@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).