diff mbox series

[v2] link/link02: Convert to new API

Message ID 20211026034241.1605-1-tangmeng@uniontech.com
State Superseded
Headers show
Series [v2] link/link02: Convert to new API | expand

Commit Message

Meng Tang Oct. 26, 2021, 3:42 a.m. UTC 
Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
 testcases/kernel/syscalls/link/link02.c | 81 +++++++------------------
 1 file changed, 23 insertions(+), 58 deletions(-)

--
2.20.1

Comments

Li Wang Oct. 26, 2021, 5:12 a.m. UTC | #1 
Hi Meng,


> --- a/testcases/kernel/syscalls/link/link02.c
> +++ b/testcases/kernel/syscalls/link/link02.c
> @@ -34,23 +34,14 @@
>   */
>

For the Copyright & Licence we should respect the original
author and use SPDX format.  Something like this:

// SPDX-License-Identifier: GPL-2.0-or-later
/*
 * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
 *  AUTHOR : William Roske
 *  CO-PILOT : Dave Fenner
 * Copyright (c) 2014 Cyril Hrubis <chrubis@suse.cz>
 */



> -int main(int ac, char **av)
> -{
> -       int lc;
> +       TST_EXP_PASS(link(OLDPATH, NEWPATH));
>
> -       tst_parse_opts(ac, av, NULL, NULL);
> +       if (!TST_PASS)
> +               return;
>
> -       setup();
> +       SAFE_STAT(OLDPATH, &fbuf);
> +       SAFE_STAT(NEWPATH, &lbuf);
>
> -       for (lc = 0; TEST_LOOPING(lc); lc++) {
> -               tst_count = 0;
> -               verify_link();
> +       if (fbuf.st_nlink > 1 && fbuf.st_nlink == lbuf.st_nlink) {
> +               tst_res(TPASS, "link("OLDPATH","NEWPATH") "
> +                                 "returned 0 and stat link counts match");
> +       } else {
> +               tst_res(TFAIL, "link("OLDPATH","NEWPATH") returned 0"
> +                                 " but stat link counts do not match %d
> %d",
> +                                 (int)fbuf.st_nlink, (int)lbuf.st_nlink);
>         }
>

As I mentioned we have to do unlink() here otherwise
test can not run pass with -i option.

        SAFE_UNLINK(NEWPATH);


> +static struct tst_test test = {
> +    .test_all = verify_link,
> +    .setup = setup,
> +    .needs_tmpdir = 1,
>

I'd suggest using tab instead of space to make
code indent.
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/link/link02.c b/testcases/kernel/syscalls/link/link02.c
index 6ac340c72..c074d71b0 100644
--- a/testcases/kernel/syscalls/link/link02.c
+++ b/testcases/kernel/syscalls/link/link02.c
@@ -34,23 +34,14 @@ 
  */

 /*
- * Tests that link(2) succeds.
+ * [Description]
+ *
+ * Tests that link(2) succeeds.
  */

-#include <sys/types.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "link02";
-int TST_TOTAL = 1;
+#include "tst_test.h"

 #define OLDPATH "oldpath"
 #define NEWPATH "newpath"
@@ -59,57 +50,31 @@  static void verify_link(void)
 {
 	struct stat fbuf, lbuf;

-	TEST(link(OLDPATH, NEWPATH));
-
-	if (TEST_RETURN == 0) {
-		SAFE_STAT(cleanup, OLDPATH, &fbuf);
-		SAFE_STAT(cleanup, NEWPATH, &lbuf);
-		if (fbuf.st_nlink > 1 && lbuf.st_nlink > 1 &&
-		    fbuf.st_nlink == lbuf.st_nlink) {
-			tst_resm(TPASS, "link("OLDPATH","NEWPATH") "
-			         "returned 0 and link counts match");
-		} else {
-			tst_resm(TFAIL, "link("OLDPATH","NEWPATH") returned 0"
-				 " but stat lin count do not match %d %d",
-				 (int)fbuf.st_nlink, (int)lbuf.st_nlink);
-		}
-		SAFE_UNLINK(cleanup, NEWPATH);
-	} else {
-		tst_resm(TFAIL | TTERRNO,
-		         "link("OLDPATH","NEWPATH") returned %ld",
-		         TEST_RETURN);
-	}
-}
-
-int main(int ac, char **av)
-{
-	int lc;
+	TST_EXP_PASS(link(OLDPATH, NEWPATH));

-	tst_parse_opts(ac, av, NULL, NULL);
+	if (!TST_PASS)
+		return;

-	setup();
+	SAFE_STAT(OLDPATH, &fbuf);
+	SAFE_STAT(NEWPATH, &lbuf);

-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-		verify_link();
+	if (fbuf.st_nlink > 1 && fbuf.st_nlink == lbuf.st_nlink) {
+		tst_res(TPASS, "link("OLDPATH","NEWPATH") "
+                                 "returned 0 and stat link counts match");
+	} else {
+		tst_res(TFAIL, "link("OLDPATH","NEWPATH") returned 0"
+                                 " but stat link counts do not match %d %d",
+                                 (int)fbuf.st_nlink, (int)lbuf.st_nlink);
 	}
-
-	cleanup();
-	tst_exit();
 }

 static void setup(void)
 {
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	SAFE_TOUCH(cleanup, OLDPATH, 0700, NULL);
+	SAFE_TOUCH(OLDPATH, 0700, NULL);
 }

-static void cleanup(void)
-{
-	tst_rmdir();
-}
+static struct tst_test test = {
+    .test_all = verify_link,
+    .setup = setup,
+    .needs_tmpdir = 1,
+};