From: Marius Kittler <mkittler@suse.de>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v1] Port getxattr03.c to new test API
Date: Thu, 21 Sep 2023 11:06:58 +0200 [thread overview]
Message-ID: <20230921090658.11224-1-mkittler@suse.de> (raw)
* Utilize `all_filesystems = 1`-mechanism to test on various file
systems instead of relying on the temporary directory's file system
to support xattr (which it probably does not as it is commonly a
tmpfs)
* Simplify code and description
Signed-off-by: Marius Kittler <mkittler@suse.de>
---
.../kernel/syscalls/getxattr/getxattr03.c | 133 +++++-------------
1 file changed, 38 insertions(+), 95 deletions(-)
diff --git a/testcases/kernel/syscalls/getxattr/getxattr03.c b/testcases/kernel/syscalls/getxattr/getxattr03.c
index b6ea14287..78ec79e5c 100644
--- a/testcases/kernel/syscalls/getxattr/getxattr03.c
+++ b/testcases/kernel/syscalls/getxattr/getxattr03.c
@@ -1,117 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it
- * is free of the rightful claim of any third person regarding
- * infringement or the like. Any license provided herein, whether
- * implied or otherwise, applies only to this software file. Patent
- * licenses, if any, provided herein do not apply to combinations of
- * this program with other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Copyright (C) 2012 Red Hat, Inc.
+ * Copyright (c) 2023 Marius Kittler <mkittler@suse.de>
*/
-/*
- * An empty buffer of size zero can be passed into getxattr(2) to return
- * the current size of the named extended attribute.
+/*\
+ * [Description]
+ *
+ * An empty buffer of size zero can be passed into getxattr(2) to
+ * return the current size of the named extended attribute.
*/
#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYS_XATTR_H
-# include <sys/xattr.h>
-#endif
-#include "test.h"
-#include "safe_macros.h"
-
-char *TCID = "getxattr03";
+#include "tst_test.h"
#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#include "tst_safe_macros.h"
+
+#define MNTPOINT "mntpoint"
+#define FNAME MNTPOINT"/getxattr03testfile"
#define XATTR_TEST_KEY "user.testkey"
#define XATTR_TEST_VALUE "test value"
#define XATTR_TEST_VALUE_SIZE (sizeof(XATTR_TEST_VALUE) - 1)
-#define TESTFILE "getxattr03testfile"
-
-static void setup(void);
-static void cleanup(void);
-int TST_TOTAL = 1;
-
-int main(int argc, char *argv[])
+static void run(void)
{
- int lc;
-
- tst_parse_opts(argc, argv, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
-
- TEST(getxattr(TESTFILE, XATTR_TEST_KEY, NULL, 0));
-
- if (TEST_RETURN == XATTR_TEST_VALUE_SIZE)
- tst_resm(TPASS, "getxattr(2) returned correct value");
- else
- tst_resm(TFAIL | TTERRNO, "getxattr(2) failed");
- }
-
- cleanup();
- tst_exit();
+ TST_EXP_VAL(getxattr(FNAME, XATTR_TEST_KEY, NULL, 0),
+ XATTR_TEST_VALUE_SIZE);
}
static void setup(void)
{
- int fd;
-
- tst_require_root();
-
- tst_tmpdir();
-
/* Test for xattr support and set attr value */
- fd = SAFE_CREAT(cleanup, TESTFILE, 0644);
- close(fd);
-
- if (setxattr(TESTFILE, XATTR_TEST_KEY, XATTR_TEST_VALUE,
- XATTR_TEST_VALUE_SIZE, XATTR_CREATE) == -1) {
- if (errno == ENOTSUP)
- tst_brkm(TCONF, cleanup, "No xattr support in fs or "
- "fs mounted without user_xattr option");
- else
- tst_brkm(TBROK | TERRNO, cleanup, "setxattr %s failed",
- TESTFILE);
- }
-
- TEST_PAUSE;
+ SAFE_TOUCH(FNAME, 0644, NULL);
+ SAFE_SETXATTR(FNAME, XATTR_TEST_KEY, XATTR_TEST_VALUE,
+ XATTR_TEST_VALUE_SIZE, XATTR_CREATE);
}
-static void cleanup(void)
-{
- tst_rmdir();
-}
+static struct tst_test test = {
+ .all_filesystems = 1,
+ .needs_root = 1,
+ .mntpoint = MNTPOINT,
+ .mount_device = 1,
+ .skip_filesystems = (const char *const []) {
+ "exfat",
+ "tmpfs",
+ "ramfs",
+ "nfs",
+ "vfat",
+ NULL
+ },
+ .setup = setup,
+ .test_all = run,
+};
+
#else /* HAVE_SYS_XATTR_H */
-int main(int argc, char *argv[])
-{
- tst_brkm(TCONF, NULL, "<sys/xattr.h> does not exist.");
-}
+TST_TEST_TCONF("System doesn't have <sys/xattr.h>");
#endif
--
2.42.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next reply other threads:[~2023-09-21 9:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 9:06 Marius Kittler [this message]
2023-09-22 0:00 ` [LTP] [PATCH v1] Port getxattr03.c to new test API Wei Gao via ltp
2023-09-22 9:23 ` Marius Kittler
2023-09-22 12:20 ` Wei Gao via ltp
2023-09-25 13:10 ` Marius Kittler
2023-11-23 10:46 ` Richard Palethorpe
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=20230921090658.11224-1-mkittler@suse.de \
--to=mkittler@suse.de \
--cc=ltp@lists.linux.it \
/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