[LTP] [PATCH] mknod01: Rewrite the test using new LTP API

* [LTP] [PATCH] mknod01: Rewrite the test using new LTP API
@ 2023-02-22  3:45 Avinesh Kumar
  2023-02-24 15:03 ` Cyril Hrubis
  0 siblings, 1 reply; 7+ messages in thread
From: Avinesh Kumar @ 2023-02-22  3:45 UTC (permalink / raw)
  To: ltp

Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
 testcases/kernel/syscalls/mknod/mknod01.c | 137 ++++++----------------
 1 file changed, 33 insertions(+), 104 deletions(-)

diff --git a/testcases/kernel/syscalls/mknod/mknod01.c b/testcases/kernel/syscalls/mknod/mknod01.c
index f79e5fa42..d4b8c7bf8 100644
--- a/testcases/kernel/syscalls/mknod/mknod01.c
+++ b/testcases/kernel/syscalls/mknod/mknod01.c
@@ -1,123 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *  AUTHOR		: William Roske
- *  CO-PILOT		: Dave Fenner
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
+ *  AUTHOR: William Roske, CO-PILOT: Dave Fenner
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
+ */
+
+/*\
+ * [Description]
  *
+ * Verify that mknod(2) successfully creates a filesystem node with
+ * various modes.
  */
 
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>
-
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "mknod01";
+#include "tst_test.h"
 
 #define PATH "test_node"
 
-int tcases[] = {		/* modes to give nodes created (1 per text case) */
-	S_IFREG | 0777,		/* ordinary file with mode 0777 */
-	S_IFIFO | 0777,		/* fifo special with mode 0777 */
-	S_IFCHR | 0777,		/* character special with mode 0777 */
-	S_IFBLK | 0777,		/* block special with mode 0777 */
+static int tcases[] = {
+	S_IFREG | 0777,
+	S_IFIFO | 0777,
+	S_IFCHR | 0777,
+	S_IFBLK | 0777,
 
-	S_IFREG | 04700,	/* ordinary file with mode 04700 (suid) */
-	S_IFREG | 02700,	/* ordinary file with mode 02700 (sgid) */
-	S_IFREG | 06700,	/* ordinary file with mode 06700 (sgid & suid) */
+	S_IFREG | 04700,
+	S_IFREG | 02700,
+	S_IFREG | 06700,
 };
 
-int TST_TOTAL = ARRAY_SIZE(tcases);
 
-int main(int ac, char **av)
+static void run(unsigned int i)
 {
-	int lc, i;
 	dev_t dev;
 
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
+	if (S_ISCHR(tcases[i]))
+		dev = makedev(1, 3);
+	else
+		dev = 0;
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++) {
-			/*
-			 * overlayfs doesn't support mknod char device with
-			 * major 0 and minor 0, which is known as whiteout_dev
-			 */
-			if (S_ISCHR(tcases[i]))
-				dev = makedev(1, 3);
-			else
-				dev = 0;
-			TEST(mknod(PATH, tcases[i], dev));
-
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL,
-					 "mknod(%s, %#o, %lu) failed, errno=%d : %s",
-					 PATH, tcases[i], dev, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TPASS,
-					 "mknod(%s, %#o, %lu) returned %ld",
-					 PATH, tcases[i], dev, TEST_RETURN);
-			}
-
-			SAFE_UNLINK(cleanup, PATH);
-		}
-
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_PASS(mknod(PATH, tcases[i], dev),
+				"mknod(PATH, %o, %ld)",
+				tcases[i], dev);
+	SAFE_UNLINK(PATH);
 }
 
-void setup(void)
-{
-	tst_require_root();
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-}
-
-void cleanup(void)
-{
-	tst_rmdir();
-}
+static struct tst_test test = {
+	.test = run,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_root = 1,
+	.needs_tmpdir = 1
+};
-- 
2.39.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply related	[flat|nested] 7+ messages in thread