aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2022-04-19 10:32:00 -0700
committerZorro Lang <zlang@kernel.org>2022-04-27 02:54:00 +0800
commitaf8aeeea48d0d876f8f9ecda307b45b655aea6a7 (patch)
tree8abf41be23219fa08a25bd92fc4e546d963daad6
parent80a82f6926faadc3d44cf07ff22f01943c3471fd (diff)
downloadxfstests-dev-af8aeeea48d0d876f8f9ecda307b45b655aea6a7.tar.gz
xfs/019: fix golden output for files created in setgid dir
A recent change to xfs/019 exposed a long-standing bug in mkfs where it would always set the gid of a new child created in a setgid directory to match the gid parent directory instead of what's in the protofile. Ignoring the user's directions is not the correct behavior, so update this test to reflect that. Also don't erase the $seqres.full file, because that makes forensic analysis pointlessly difficult. Cc: Catherine Hoang <catherine.hoang@oracle.com> Fixes: 7834a740 ("xfs/019: extend protofile test") Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Catherine Hoang <catherine.hoang@oracle.com> Reviewed-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-xtests/xfs/0193
-rw-r--r--tests/xfs/019.out2
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/xfs/019 b/tests/xfs/019
index 535b7af1a7..790a6821a3 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -10,6 +10,7 @@
_begin_fstest mkfs auto quick
seqfull="$seqres.full"
+rm -f $seqfull
# Import common functions.
. ./common/filter
@@ -97,7 +98,6 @@ _verify_fs()
echo "*** create FS version $1"
VERSION="-n version=$1"
- rm -f $seqfull
_scratch_unmount >/dev/null 2>&1
_full "mkfs"
@@ -131,6 +131,5 @@ _verify_fs()
_verify_fs 2
echo "*** done"
-rm $seqfull
status=0
exit
diff --git a/tests/xfs/019.out b/tests/xfs/019.out
index 8584f593e9..9db157f9b4 100644
--- a/tests/xfs/019.out
+++ b/tests/xfs/019.out
@@ -61,7 +61,7 @@ Device: <DEVICE> Inode: <INODE> Links: 2
File: "./directory_setgid/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_5"
Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (2)
+ Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 1
File: "./pipe"