From: Eric Biggers Date: Wed, 12 Oct 2016 22:03:08 +0000 (-0700) Subject: generic/314: don't test SGID behavior after setfacl X-Git-Tag: v2022.05.01~2327 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8cfd58a5dbb9bbf8924c68f4ca13bfe41eabce91;p=users%2Fhch%2Fxfstests-dev.git generic/314: don't test SGID behavior after setfacl Linux 4.9 (since commit 073931017b49: "posix_acl: Clear SGID bit when setting file permissions") now may clear the SGID bit when setting a POSIX ACL, to match chmod() behavior. This was making generic/314 fail. Since SGID bit clearing on setfacl is already tested by generic/375, just remove the problematic portion of generic/314. Signed-off-by: Eric Biggers Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/generic/314 b/tests/generic/314 index 65d35136b..49b03e472 100755 --- a/tests/generic/314 +++ b/tests/generic/314 @@ -39,12 +39,10 @@ _cleanup() # get standard environment, filters and checks . ./common/rc . ./common/filter -. ./common/attr # real QA test starts here _supported_fs generic _require_test -_require_acls _require_user rm -rf $TEST_DIR/$seq-dir @@ -56,12 +54,10 @@ chown $qa_user:12345 $TEST_DIR/$seq-dir # Make parent dir sgid chmod 2775 $TEST_DIR/$seq-dir -# Make subdirs before & after acl set +# Make subdir su $qa_user -c "umask 022; mkdir $TEST_DIR/$seq-dir/subdir" -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 +# Subdir should have inherited sgid _ls_l $TEST_DIR/$seq-dir/ | grep -v total | _filter_test_dir | awk '{print $1,$NF}' status=0 diff --git a/tests/generic/314.out b/tests/generic/314.out index b2db82be1..bcd14f5c6 100644 --- a/tests/generic/314.out +++ b/tests/generic/314.out @@ -1,3 +1,2 @@ QA output created by 314 drwxr-sr-x subdir -drwxrwsr-x+ subdir2