[LTP] [PATCH v2] syscalls/statx04: use stx_attributes_mask before test
Yang Xu
xuyang2018.jy@cn.fujitsu.com
Tue Aug 20 08:33:58 CEST 2019
stx_attributes_mask shows what's supported in stx_attributes.
we should check four attrbutes whether supports on tested filesystem
and only test supported flags on tested filesystem.
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
testcases/kernel/syscalls/statx/statx04.c | 124 ++++++++++++++++------
1 file changed, 91 insertions(+), 33 deletions(-)
diff --git a/testcases/kernel/syscalls/statx/statx04.c b/testcases/kernel/syscalls/statx/statx04.c
index 71de734f5..7b462c3f9 100644
--- a/testcases/kernel/syscalls/statx/statx04.c
+++ b/testcases/kernel/syscalls/statx/statx04.c
@@ -34,6 +34,10 @@
#define TESTDIR_UNFLAGGED MOUNT_POINT"/test_dir2"
static int fd, clear_flags;
+static int supp_compr;
+static int supp_append;
+static int supp_immutable;
+static int supp_nodump;
static void test_flagged(void)
{
@@ -47,25 +51,33 @@ static void test_flagged(void)
tst_brk(TFAIL | TTERRNO,
"sys_statx(AT_FDCWD, %s, 0, 0, &buf)", TESTDIR_FLAGGED);
- if (buf.stx_attributes & STATX_ATTR_COMPRESSED)
- tst_res(TPASS, "STATX_ATTR_COMPRESSED flag is set");
- else
- tst_res(TFAIL, "STATX_ATTR_COMPRESSED flag is not set");
+ if (supp_compr) {
+ if (buf.stx_attributes & STATX_ATTR_COMPRESSED)
+ tst_res(TPASS, "STATX_ATTR_COMPRESSED flag is set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_COMPRESSED flag is not set");
+ }
- if (buf.stx_attributes & STATX_ATTR_APPEND)
- tst_res(TPASS, "STATX_ATTR_APPEND flag is set");
- else
- tst_res(TFAIL, "STATX_ATTR_APPEND flag is not set");
+ if (supp_append) {
+ if (buf.stx_attributes & STATX_ATTR_APPEND)
+ tst_res(TPASS, "STATX_ATTR_APPEND flag is set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_APPEND flag is not set");
+ }
- if (buf.stx_attributes & STATX_ATTR_IMMUTABLE)
- tst_res(TPASS, "STATX_ATTR_IMMUTABLE flag is set");
- else
- tst_res(TFAIL, "STATX_ATTR_IMMUTABLE flag is not set");
+ if (supp_immutable) {
+ if (buf.stx_attributes & STATX_ATTR_IMMUTABLE)
+ tst_res(TPASS, "STATX_ATTR_IMMUTABLE flag is set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_IMMUTABLE flag is not set");
+ }
- if (buf.stx_attributes & STATX_ATTR_NODUMP)
- tst_res(TPASS, "STATX_ATTR_NODUMP flag is set");
- else
- tst_res(TFAIL, "STATX_ATTR_NODUMP flag is not set");
+ if (supp_nodump) {
+ if (buf.stx_attributes & STATX_ATTR_NODUMP)
+ tst_res(TPASS, "STATX_ATTR_NODUMP flag is set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_NODUMP flag is not set");
+ }
}
static void test_unflagged(void)
@@ -82,25 +94,33 @@ static void test_unflagged(void)
"sys_statx(AT_FDCWD, %s, 0, 0, &buf)",
TESTDIR_UNFLAGGED);
- if ((buf.stx_attributes & STATX_ATTR_COMPRESSED) == 0)
- tst_res(TPASS, "STATX_ATTR_COMPRESSED flag is not set");
- else
- tst_res(TFAIL, "STATX_ATTR_COMPRESSED flag is set");
+ if (supp_compr) {
+ if ((buf.stx_attributes & STATX_ATTR_COMPRESSED) == 0)
+ tst_res(TPASS, "STATX_ATTR_COMPRESSED flag is not set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_COMPRESSED flag is set");
+ }
- if ((buf.stx_attributes & STATX_ATTR_APPEND) == 0)
- tst_res(TPASS, "STATX_ATTR_APPEND flag is not set");
- else
- tst_res(TFAIL, "STATX_ATTR_APPEND flag is set");
+ if (supp_append) {
+ if ((buf.stx_attributes & STATX_ATTR_APPEND) == 0)
+ tst_res(TPASS, "STATX_ATTR_APPEND flag is not set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_APPEND flag is set");
+ }
- if ((buf.stx_attributes & STATX_ATTR_IMMUTABLE) == 0)
- tst_res(TPASS, "STATX_ATTR_IMMUTABLE flag is not set");
- else
- tst_res(TFAIL, "STATX_ATTR_IMMUTABLE flag is set");
+ if (supp_immutable) {
+ if ((buf.stx_attributes & STATX_ATTR_IMMUTABLE) == 0)
+ tst_res(TPASS, "STATX_ATTR_IMMUTABLE flag is not set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_IMMUTABLE flag is set");
+ }
- if ((buf.stx_attributes & STATX_ATTR_NODUMP) == 0)
- tst_res(TPASS, "STATX_ATTR_NODUMP flag is not set");
- else
- tst_res(TFAIL, "STATX_ATTR_NODUMP flag is set");
+ if (supp_nodump) {
+ if ((buf.stx_attributes & STATX_ATTR_NODUMP) == 0)
+ tst_res(TPASS, "STATX_ATTR_NODUMP flag is not set");
+ else
+ tst_res(TFAIL, "STATX_ATTR_NODUMP flag is set");
+ }
}
struct test_cases {
@@ -135,7 +155,14 @@ static void caid_flags_setup(void)
tst_brk(TBROK | TERRNO, "ioctl(%i, FS_IOC_GETFLAGS, ...)", fd);
}
- attr |= FS_COMPR_FL | FS_APPEND_FL | FS_IMMUTABLE_FL | FS_NODUMP_FL;
+ if (supp_compr)
+ attr |= FS_COMPR_FL;
+ if (supp_append)
+ attr |= FS_APPEND_FL;
+ if (supp_immutable)
+ attr |= FS_IMMUTABLE_FL;
+ if (supp_nodump)
+ attr |= FS_NODUMP_FL;
ret = ioctl(fd, FS_IOC_SETFLAGS, &attr);
if (ret < 0) {
@@ -149,12 +176,43 @@ static void caid_flags_setup(void)
static void setup(void)
{
+ struct statx buf;
+
+ supp_compr = 1;
+ supp_append = 1;
+ supp_immutable = 1;
+ supp_nodump = 1;
SAFE_MKDIR(TESTDIR_FLAGGED, 0777);
SAFE_MKDIR(TESTDIR_UNFLAGGED, 0777);
if (!strcmp(tst_device->fs_type, "btrfs") && tst_kvercmp(4, 13, 0) < 0)
tst_brk(TCONF, "Btrfs statx() supported since 4.13");
+ TEST(statx(AT_FDCWD, TESTDIR_FLAGGED, 0, 0, &buf));
+ if (TST_RET == -1)
+ tst_brk(TFAIL | TTERRNO,
+ "sys_statx(AT_FDCWD, %s, 0, 0, &buf)", TESTDIR_FLAGGED);
+
+ if ((buf.stx_attributes_mask & FS_COMPR_FL) == 0) {
+ supp_compr = 0;
+ tst_res(TCONF, "filesystem doesn't support FS_COMPR_FL");
+ }
+ if ((buf.stx_attributes_mask & FS_APPEND_FL) == 0) {
+ supp_append = 0;
+ tst_res(TCONF, "filesystem doesn't support FS_APPEND_FL");
+ }
+ if ((buf.stx_attributes_mask & FS_IMMUTABLE_FL) == 0) {
+ supp_immutable = 0;
+ tst_res(TCONF, "filesystem doesn't support FS_IMMUTABLE_FL");
+ }
+ if ((buf.stx_attributes_mask & FS_NODUMP_FL) == 0) {
+ supp_nodump = 0;
+ tst_res(TCONF, "filesystem doesn't support FS_NODUMP_FL");
+ }
+ if (!(supp_compr || supp_append || supp_immutable || supp_nodump))
+ tst_brk(TCONF,
+ "filesystem doesn't support the above any attr, skip it");
+
caid_flags_setup();
}
--
2.18.1
More information about the ltp
mailing list