Since we plan to increase setgid test covertage, it will find new bug
, so add a new test group test-setgid is better.
Also add a new test case to test test-setgid instead of miss it.
Signed-off-by: Yang Xu <xuyang2018.jy@xxxxxxxxxxx>
---
src/idmapped-mounts/idmapped-mounts.c | 19 +++++++++++++++----
tests/generic/999 | 26 ++++++++++++++++++++++++++
tests/generic/999.out | 2 ++
3 files changed, 43 insertions(+), 4 deletions(-)
create mode 100755 tests/generic/999
create mode 100644 tests/generic/999.out
diff --git a/src/idmapped-mounts/idmapped-mounts.c b/src/idmapped-mounts/idmapped-mounts.c
index 4cf6c3bb..dff6820f 100644
--- a/src/idmapped-mounts/idmapped-mounts.c
+++ b/src/idmapped-mounts/idmapped-mounts.c
@@ -13809,6 +13809,7 @@ static void usage(void)
fprintf(stderr, "--test-nested-userns Run nested userns idmapped mount testsuite\n");
fprintf(stderr, "--test-btrfs Run btrfs specific idmapped mount testsuite\n");
fprintf(stderr, "--test-setattr-fix-968219708108 Run setattr regression tests\n");
+ fprintf(stderr, "--test-setgid Run setgid create tests\n");
_exit(EXIT_SUCCESS);
}
@@ -13826,6 +13827,7 @@ static const struct option longopts[] = {
{"test-nested-userns", no_argument, 0, 'n'},
{"test-btrfs", no_argument, 0, 'b'},
{"test-setattr-fix-968219708108", no_argument, 0, 'i'},
+ {"test-setgid", no_argument, 0, 'j'},
{NULL, 0, 0, 0},
};
@@ -13866,9 +13868,6 @@ struct t_idmapped_mounts {
{ setattr_truncate, false, "setattr truncate", },
{ setattr_truncate_idmapped, true, "setattr truncate on idmapped mounts", },
{ setattr_truncate_idmapped_in_userns, true, "setattr truncate on idmapped mounts in user namespace", },
- { setgid_create, false, "create operations in directories with setgid bit set", },
- { setgid_create_idmapped, true, "create operations in directories with setgid bit set on idmapped mounts", },
- { setgid_create_idmapped_in_userns, true, "create operations in directories with setgid bit set on idmapped mounts in user namespace", },
{ setid_binaries, false, "setid binaries on regular mounts", },
{ setid_binaries_idmapped_mounts, true, "setid binaries on idmapped mounts", },
{ setid_binaries_idmapped_mounts_in_userns, true, "setid binaries on idmapped mounts in user namespace", },
@@ -13923,6 +13922,12 @@ struct t_idmapped_mounts t_setattr_fix_968219708108[] = {
{ setattr_fix_968219708108, true, "test that setattr works correctly", },
};
+struct t_idmapped_mounts t_setgid[] = {
+ { setgid_create, false, "create operations in directories with setgid bit set", },
+ { setgid_create_idmapped, true, "create operations in directories with setgid bit set on idmapped mounts", },
+ { setgid_create_idmapped_in_userns, true, "create operations in directories with setgid bit set on idmapped mounts in user namespace", },
+};
+
static bool run_test(struct t_idmapped_mounts suite[], size_t suite_size)
{
int i;
@@ -14000,7 +14005,7 @@ int main(int argc, char *argv[])
int index = 0;
bool supported = false, test_btrfs = false, test_core = false,
test_fscaps_regression = false, test_nested_userns = false,
- test_setattr_fix_968219708108 = false;
+ test_setattr_fix_968219708108 = false, test_setgid = false;
while ((ret = getopt_long_only(argc, argv, "", longopts, &index)) != -1) {
switch (ret) {
@@ -14037,6 +14042,9 @@ int main(int argc, char *argv[])
case 'i':
test_setattr_fix_968219708108 = true;
break;
+ case 'j':
+ test_setgid = true;
+ break;
case 'h':
/* fallthrough */
default:
@@ -14106,6 +14114,9 @@ int main(int argc, char *argv[])
ARRAY_SIZE(t_setattr_fix_968219708108)))
goto out;
+ if (test_setgid && !run_test(t_setgid, ARRAY_SIZE(t_setgid)))
+ goto out;
+
fret = EXIT_SUCCESS;
out:
diff --git a/tests/generic/999 b/tests/generic/999
new file mode 100755
index 00000000..46a34804
--- /dev/null
+++ b/tests/generic/999
@@ -0,0 +1,26 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved
+#
+# FS QA Test 999
+#
+# Test that setgid bit behave correctly.
+#
+. ./common/preamble
+_begin_fstest auto quick cap idmapped mount perms rw
+
+# Import common functions.
+. ./common/filter
+
+# real QA test starts here
+
+_supported_fs generic
+_require_test
+
+echo "Silence is golden"
+
+$here/src/idmapped-mounts/idmapped-mounts --test-setgid --device "$TEST_DEV" \
+ --mount "$TEST_DIR" --fstype "$FSTYP"
+
+status=$?
+exit
diff --git a/tests/generic/999.out b/tests/generic/999.out
new file mode 100644
index 00000000..3b276ca8
--- /dev/null
+++ b/tests/generic/999.out
@@ -0,0 +1,2 @@
+QA output created by 999
+Silence is golden
--
2.27.0
