All of lore.kernel.org
 help / color / mirror / Atom feed
* [LTP] [PATCH 0/2] cleanup: Modify incorrect use of test macros and annotation style
@ 2021-04-02  3:46 Xie Ziyao
  2021-04-02  3:46 ` [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros Xie Ziyao
  2021-04-02  3:46 ` [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code Xie Ziyao
  0 siblings, 2 replies; 7+ messages in thread
From: Xie Ziyao @ 2021-04-02  3:46 UTC (permalink / raw)
  To: ltp

- modify incorrect use of test macros;
- unify the annotation style and remove Redundant code.

Xie Ziyao (2):
  Modify incorrect use of TERRNO and replace functions with safe_macros
  Unify the annotation style and remove Redundant code

 testcases/kernel/syscalls/bpf/bpf_map01.c     |  2 +-
 .../syscalls/clock_gettime/clock_gettime03.c  | 20 +++++++------------
 .../clock_nanosleep/clock_nanosleep01.c       |  2 +-
 .../clock_nanosleep/clock_nanosleep03.c       | 18 +++++++----------
 testcases/kernel/syscalls/clone3/clone301.c   |  5 +++++
 testcases/kernel/syscalls/clone3/clone302.c   |  5 +++++
 .../copy_file_range/copy_file_range02.c       |  2 +-
 .../copy_file_range/copy_file_range03.c       |  2 +-
 testcases/kernel/syscalls/dup/dup03.c         |  4 ++--
 testcases/kernel/syscalls/execle/Makefile     | 19 +++---------------
 testcases/kernel/syscalls/execlp/Makefile     | 19 +++---------------
 testcases/kernel/syscalls/execve/execve02.c   |  4 ++--
 testcases/kernel/syscalls/execvp/Makefile     | 20 +++----------------
 .../kernel/syscalls/fallocate/fallocate04.c   |  2 +-
 testcases/kernel/syscalls/getcwd/getcwd01.c   |  4 ++--
 testcases/kernel/syscalls/getcwd/getcwd02.c   |  2 +-
 .../syscalls/init_module/init_module01.c      |  2 +-
 .../syscalls/init_module/init_module02.c      |  2 +-
 .../kernel/syscalls/io_uring/io_uring02.c     | 10 +++++-----
 testcases/kernel/syscalls/ioctl/ioctl04.c     |  4 ++--
 testcases/kernel/syscalls/ioperm/ioperm01.c   |  2 +-
 testcases/kernel/syscalls/lgetxattr/Makefile  | 16 +--------------
 22 files changed, 56 insertions(+), 110 deletions(-)

--
2.17.1


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

* [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros
  2021-04-02  3:46 [LTP] [PATCH 0/2] cleanup: Modify incorrect use of test macros and annotation style Xie Ziyao
@ 2021-04-02  3:46 ` Xie Ziyao
  2021-05-11  6:32   ` Petr Vorel
  2021-04-02  3:46 ` [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code Xie Ziyao
  1 sibling, 1 reply; 7+ messages in thread
From: Xie Ziyao @ 2021-04-02  3:46 UTC (permalink / raw)
  To: ltp

- modify some incorrect use of TERRNO/TTERRNO in kernel/syscalls;
- replace functions with safe_macros to check the return value in kernel/syscalls.

Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
 testcases/kernel/syscalls/bpf/bpf_map01.c              |  2 +-
 .../syscalls/clock_nanosleep/clock_nanosleep01.c       |  2 +-
 .../syscalls/copy_file_range/copy_file_range02.c       |  2 +-
 .../syscalls/copy_file_range/copy_file_range03.c       |  2 +-
 testcases/kernel/syscalls/dup/dup03.c                  |  4 ++--
 testcases/kernel/syscalls/execve/execve02.c            |  4 ++--
 testcases/kernel/syscalls/fallocate/fallocate04.c      |  2 +-
 testcases/kernel/syscalls/getcwd/getcwd01.c            |  4 ++--
 testcases/kernel/syscalls/getcwd/getcwd02.c            |  2 +-
 testcases/kernel/syscalls/init_module/init_module01.c  |  2 +-
 testcases/kernel/syscalls/init_module/init_module02.c  |  2 +-
 testcases/kernel/syscalls/io_uring/io_uring02.c        | 10 +++++-----
 testcases/kernel/syscalls/ioctl/ioctl04.c              |  4 ++--
 testcases/kernel/syscalls/ioperm/ioperm01.c            |  2 +-
 14 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/testcases/kernel/syscalls/bpf/bpf_map01.c b/testcases/kernel/syscalls/bpf/bpf_map01.c
index 69473cd04..e0c3b1bf4 100644
--- a/testcases/kernel/syscalls/bpf/bpf_map01.c
+++ b/testcases/kernel/syscalls/bpf/bpf_map01.c
@@ -83,7 +83,7 @@ void run(unsigned int n)
 			if (i < VAL_SZ)
 				tst_res(TPASS, "Preallocated array map lookup");
 		} else {
-			tst_res(TFAIL | TERRNO, "Prellocated array map lookup");
+			tst_res(TFAIL | TTERRNO, "Prellocated array map lookup");
 		}
 	break;
 	}
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index 516ab50f1..382497918 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -208,7 +208,7 @@ static void do_test(unsigned int i)
 		return;
 	}

-	tst_res(TPASS | TERRNO, "clock_nanosleep() failed with");
+	tst_res(TPASS | TTERRNO, "clock_nanosleep() failed with");
 }

 static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
index bc27fbe57..4bab393c7 100644
--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
@@ -221,7 +221,7 @@ static void setup(void)
 	SAFE_PIPE(fd_pipe);

 	SAFE_WRITE(1, fd_src, CONTENT, CONTSIZE);
-	close(fd_src);
+	SAFE_CLOSE(fd_src);
 	fd_src = SAFE_OPEN(FILE_SRC_PATH, O_RDONLY, 0664);
 	fd_dup = SAFE_OPEN(FILE_SRC_PATH, O_WRONLY|O_CREAT, 0666);

diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range03.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range03.c
index 253eb57ad..71014e9e2 100644
--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range03.c
+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range03.c
@@ -21,7 +21,7 @@ unsigned long get_timestamp(int fd)
 {
 	struct stat filestat;

-	fstat(fd, &filestat);
+	SAFE_FSTAT(fd, &filestat);
 	return filestat.st_mtime;
 }

diff --git a/testcases/kernel/syscalls/dup/dup03.c b/testcases/kernel/syscalls/dup/dup03.c
index caef078b2..0e99813f4 100644
--- a/testcases/kernel/syscalls/dup/dup03.c
+++ b/testcases/kernel/syscalls/dup/dup03.c
@@ -30,9 +30,9 @@ static void run(void)

 	if (TST_RET == -1) {
 		if (TST_ERR == EMFILE)
-			tst_res(TPASS | TERRNO, "dup() failed as expected");
+			tst_res(TPASS | TTERRNO, "dup() failed as expected");
 		else
-			tst_res(TFAIL | TERRNO, "dup() failed unexpectedly");
+			tst_res(TFAIL | TTERRNO, "dup() failed unexpectedly");
 		return;
 	}

diff --git a/testcases/kernel/syscalls/execve/execve02.c b/testcases/kernel/syscalls/execve/execve02.c
index d9fb5b919..0574f5c8b 100644
--- a/testcases/kernel/syscalls/execve/execve02.c
+++ b/testcases/kernel/syscalls/execve/execve02.c
@@ -49,9 +49,9 @@ static void do_child(void)
 		tst_brk(TFAIL, "execve() passed unexpectedly");

 	if (TST_ERR != EACCES)
-		tst_brk(TFAIL | TERRNO, "execve() failed unexpectedly");
+		tst_brk(TFAIL | TTERRNO, "execve() failed unexpectedly");

-	tst_res(TPASS | TERRNO, "execve() failed expectedly");
+	tst_res(TPASS | TTERRNO, "execve() failed expectedly");

 	exit(0);
 }
diff --git a/testcases/kernel/syscalls/fallocate/fallocate04.c b/testcases/kernel/syscalls/fallocate/fallocate04.c
index 7ffc8f4fa..dfc27e3a8 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate04.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate04.c
@@ -43,7 +43,7 @@ static size_t get_allocsize(void)
 {
 	struct stat file_stat;

-	fsync(fd);
+	SAFE_FSYNC(fd);

 	SAFE_FSTAT(fd, &file_stat);

diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c
index 65d827873..4b60b86d8 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd01.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd01.c
@@ -54,12 +54,12 @@ static void verify_getcwd(unsigned int n)
 	}

 	if (TST_ERR != tc->exp_err) {
-		tst_res(TFAIL | TTERRNO, "getcwd() failed unexpectedly, expected %s",
+		tst_res(TFAIL | TERRNO, "getcwd() failed unexpectedly, expected %s",
 			tst_strerrno(tc->exp_err));
 		return;
 	}

-	tst_res(TPASS | TTERRNO, "getcwd() failed as expected");
+	tst_res(TPASS | TERRNO, "getcwd() failed as expected");
 }

 static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/getcwd/getcwd02.c b/testcases/kernel/syscalls/getcwd/getcwd02.c
index e843a4896..b0c5f3750 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd02.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd02.c
@@ -73,7 +73,7 @@ static void verify_getcwd(unsigned int n)
 	res = getcwd(tc->buf, tc->size);
 	TST_ERR = errno;
 	if (!res) {
-		tst_res(TFAIL | TTERRNO, "getcwd() failed");
+		tst_res(TFAIL | TERRNO, "getcwd() failed");
 		goto end;
 	}

diff --git a/testcases/kernel/syscalls/init_module/init_module01.c b/testcases/kernel/syscalls/init_module/init_module01.c
index 2f47eed32..ae08da5fd 100644
--- a/testcases/kernel/syscalls/init_module/init_module01.c
+++ b/testcases/kernel/syscalls/init_module/init_module01.c
@@ -45,7 +45,7 @@ static void run(void)

 static void cleanup(void)
 {
-	munmap(buf, sb.st_size);
+	SAFE_MUNMAP(buf, sb.st_size);
 }

 static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/init_module/init_module02.c b/testcases/kernel/syscalls/init_module/init_module02.c
index 3953f4f61..4ffda1956 100644
--- a/testcases/kernel/syscalls/init_module/init_module02.c
+++ b/testcases/kernel/syscalls/init_module/init_module02.c
@@ -86,7 +86,7 @@ static void run(unsigned int n)

 static void cleanup(void)
 {
-	munmap(buf, size);
+	SAFE_MUNMAP(buf, size);
 }

 static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/io_uring/io_uring02.c b/testcases/kernel/syscalls/io_uring/io_uring02.c
index 5127ff980..8ec2e9187 100644
--- a/testcases/kernel/syscalls/io_uring/io_uring02.c
+++ b/testcases/kernel/syscalls/io_uring/io_uring02.c
@@ -134,7 +134,7 @@ static void drain_fallback(void)
 			if (cqe_ptr->res >= 0 || cqe_ptr->res == -EAGAIN)
 				continue;

-			tst_res(TFAIL | TTERRNO,
+			tst_res(TFAIL | TERRNO,
 				"Spam request failed unexpectedly");
 			continue;
 		}
@@ -150,10 +150,10 @@ static void drain_fallback(void)
 		if (cqe_ptr->res >= 0) {
 			tst_res(TFAIL, "Write outside chroot succeeded.");
 		} else if (cqe_ptr->res != -ENOENT) {
-			tst_res(TFAIL | TTERRNO,
+			tst_res(TFAIL | TERRNO,
 				"Write outside chroot failed unexpectedly");
 		} else {
-			tst_res(TPASS | TTERRNO,
+			tst_res(TPASS | TERRNO,
 				"Write outside chroot failed as expected");
 		}
 	}
@@ -197,12 +197,12 @@ static void check_result(void)
 	}

 	if (cqe_ptr->res != -ENOENT) {
-		tst_res(TFAIL | TTERRNO,
+		tst_res(TFAIL | TERRNO,
 			"Write outside chroot failed unexpectedly");
 		return;
 	}

-	tst_res(TPASS | TTERRNO, "Write outside chroot failed as expected");
+	tst_res(TPASS | TERRNO, "Write outside chroot failed as expected");
 }

 static void run(void)
diff --git a/testcases/kernel/syscalls/ioctl/ioctl04.c b/testcases/kernel/syscalls/ioctl/ioctl04.c
index 353114cc0..d9ddb8e59 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl04.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl04.c
@@ -47,11 +47,11 @@ static void verify_ioctl(void)
 	}

 	if (TST_ERR == EACCES) {
-		tst_res(TPASS | TERRNO, "Mounting RO device RW failed");
+		tst_res(TPASS | TTERRNO, "Mounting RO device RW failed");
 		goto next;
 	}

-	tst_res(TFAIL | TERRNO,
+	tst_res(TFAIL | TTERRNO,
 		"Mounting RO device RW failed unexpectedly expected EACCES");

 next:
diff --git a/testcases/kernel/syscalls/ioperm/ioperm01.c b/testcases/kernel/syscalls/ioperm/ioperm01.c
index fc5754be9..6c50a0b75 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm01.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm01.c
@@ -64,7 +64,7 @@ static void cleanup(void)
 	 * Reset I/O privileges for the specified port.
 	 */
 	if ((ioperm(io_addr, NUM_BYTES, 0)) == -1)
-		tst_brk(TBROK | TTERRNO, "ioperm() cleanup failed");
+		tst_brk(TBROK | TERRNO, "ioperm() cleanup failed");
 }

 static struct tst_test test = {
--
2.17.1


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

* [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code
  2021-04-02  3:46 [LTP] [PATCH 0/2] cleanup: Modify incorrect use of test macros and annotation style Xie Ziyao
  2021-04-02  3:46 ` [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros Xie Ziyao
@ 2021-04-02  3:46 ` Xie Ziyao
  2021-05-11  6:31   ` Petr Vorel
  1 sibling, 1 reply; 7+ messages in thread
From: Xie Ziyao @ 2021-04-02  3:46 UTC (permalink / raw)
  To: ltp

Change License for Makefile and remove some unnecessary annotation
in kernel/syscalls.

Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
 .../syscalls/clock_gettime/clock_gettime03.c  | 20 +++++++------------
 .../clock_nanosleep/clock_nanosleep03.c       | 18 +++++++----------
 testcases/kernel/syscalls/clone3/clone301.c   |  5 +++++
 testcases/kernel/syscalls/clone3/clone302.c   |  5 +++++
 testcases/kernel/syscalls/execle/Makefile     | 19 +++---------------
 testcases/kernel/syscalls/execlp/Makefile     | 19 +++---------------
 testcases/kernel/syscalls/execvp/Makefile     | 20 +++----------------
 testcases/kernel/syscalls/lgetxattr/Makefile  | 16 +--------------
 8 files changed, 34 insertions(+), 88 deletions(-)

diff --git a/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c b/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c
index dc570a06c..ef6bb119e 100644
--- a/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c
+++ b/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c
@@ -1,20 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
-
-  Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
-
+ * Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
  */
 /*
-
-  Basic test for timer namespaces.
-
-  After a call to unshare(CLONE_NEWTIME) a new timer namespace is created, the
-  process that has called the unshare() can adjust offsets for CLOCK_MONOTONIC
-  and CLOCK_BOOTTIME for its children by writing to the '/proc/self/timens_offsets'.
-
-  The child processes also switch to the initial parent namespace and checks
-  that the offset is set to 0.
-
+ * After a call to unshare(CLONE_NEWTIME) a new timer namespace is created, the
+ * process that has called the unshare() can adjust offsets for CLOCK_MONOTONIC
+ * and CLOCK_BOOTTIME for its children by writing to the '/proc/self/timens_offsets'.
+ *
+ * The child processes also switch to the initial parent namespace and checks
+ * that the offset is set to 0.
  */

 #define _GNU_SOURCE
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
index bd2c38ee3..1d964d118 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
@@ -1,18 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
-
-  Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
-
+ * Copyright (c) 2020 Cyril Hrubis <chrubis@suse.cz>
  */
-/*
-
-   Test that clock_nanosleep() adds correctly an offset with absolute timeout
-   and CLOCK_MONOTONIC inside of a timer namespace.
-
-   After a call to unshare(CLONE_NEWTIME) a new timer namespace is created, the
-   process that has called the unshare() can adjust offsets for CLOCK_MONOTONIC
-   and CLOCK_BOOTTIME for its children by writing to the '/proc/self/timens_offsets'.

+/*
+ * Test that clock_nanosleep() adds correctly an offset with absolute timeout
+ * and CLOCK_MONOTONIC inside of a timer namespace.
+ * After a call to unshare(CLONE_NEWTIME) a new timer namespace is created, the
+ * process that has called the unshare() can adjust offsets for CLOCK_MONOTONIC
+ * and CLOCK_BOOTTIME for its children by writing to the '/proc/self/timens_offsets'.
  */

 #include <stdlib.h>
diff --git a/testcases/kernel/syscalls/clone3/clone301.c b/testcases/kernel/syscalls/clone3/clone301.c
index 11787fc7e..7ac4bb5a3 100644
--- a/testcases/kernel/syscalls/clone3/clone301.c
+++ b/testcases/kernel/syscalls/clone3/clone301.c
@@ -1,9 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [Description]
  *
  * Basic clone3() test.
  */
+
 #define _GNU_SOURCE

 #include <stdlib.h>
diff --git a/testcases/kernel/syscalls/clone3/clone302.c b/testcases/kernel/syscalls/clone3/clone302.c
index 54d59a1f5..08d6417ce 100644
--- a/testcases/kernel/syscalls/clone3/clone302.c
+++ b/testcases/kernel/syscalls/clone3/clone302.c
@@ -1,9 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [Description]
  *
  * Basic clone3() test to check various failures.
  */
+
 #define _GNU_SOURCE

 #include <stdlib.h>
diff --git a/testcases/kernel/syscalls/execle/Makefile b/testcases/kernel/syscalls/execle/Makefile
index a0e5f0fc4..ea102983a 100644
--- a/testcases/kernel/syscalls/execle/Makefile
+++ b/testcases/kernel/syscalls/execle/Makefile
@@ -1,20 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-#  Copyright (c) Linux Test Project, 2018
-#  Copyright (c) International Business Machines  Corp., 2001
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
+# Copyright (c) Linux Test Project, 2018
+# Copyright (c) International Business Machines  Corp., 2001

 top_srcdir		?= ../../../..

diff --git a/testcases/kernel/syscalls/execlp/Makefile b/testcases/kernel/syscalls/execlp/Makefile
index a0e5f0fc4..ea102983a 100644
--- a/testcases/kernel/syscalls/execlp/Makefile
+++ b/testcases/kernel/syscalls/execlp/Makefile
@@ -1,20 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-#  Copyright (c) Linux Test Project, 2018
-#  Copyright (c) International Business Machines  Corp., 2001
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
+# Copyright (c) Linux Test Project, 2018
+# Copyright (c) International Business Machines  Corp., 2001

 top_srcdir		?= ../../../..

diff --git a/testcases/kernel/syscalls/execvp/Makefile b/testcases/kernel/syscalls/execvp/Makefile
index a0e5f0fc4..d44bfa32b 100644
--- a/testcases/kernel/syscalls/execvp/Makefile
+++ b/testcases/kernel/syscalls/execvp/Makefile
@@ -1,20 +1,6 @@
-#
-#  Copyright (c) Linux Test Project, 2018
-#  Copyright (c) International Business Machines  Corp., 2001
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2018
+# Copyright (c) International Business Machines  Corp., 2001

 top_srcdir		?= ../../../..

diff --git a/testcases/kernel/syscalls/lgetxattr/Makefile b/testcases/kernel/syscalls/lgetxattr/Makefile
index b788fed03..28f5f6f9a 100644
--- a/testcases/kernel/syscalls/lgetxattr/Makefile
+++ b/testcases/kernel/syscalls/lgetxattr/Makefile
@@ -1,20 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (c) 2016 Fujitsu Ltd.
 # Author: Jinbao Huang <huangjb.jy@cn.fujitsu.com>
-#
-# This program is free software;  you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation;  either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY;  without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.
-#

 top_srcdir		?= ../../../..

--
2.17.1


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

* [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code
  2021-04-02  3:46 ` [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code Xie Ziyao
@ 2021-05-11  6:31   ` Petr Vorel
  2021-05-12  8:51     ` Xie Ziyao
  0 siblings, 1 reply; 7+ messages in thread
From: Petr Vorel @ 2021-05-11  6:31 UTC (permalink / raw)
  To: ltp

Hi Ziyao,

> Change License for Makefile and remove some unnecessary annotation
> in kernel/syscalls.

Thanks, merged!
I slightly modified C code changes - put docparse into clock_nanosleep03.c and
clock_gettime03.c and modified the commit message.

Next time it'd be better to separate these changes - put Makefile changes into
separate commit and ideally use script to replace all of them.

Kind regards,
Petr

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

* [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros
  2021-04-02  3:46 ` [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros Xie Ziyao
@ 2021-05-11  6:32   ` Petr Vorel
  2021-05-11  8:37     ` Xie Ziyao
  0 siblings, 1 reply; 7+ messages in thread
From: Petr Vorel @ 2021-05-11  6:32 UTC (permalink / raw)
  To: ltp

> - modify some incorrect use of TERRNO/TTERRNO in kernel/syscalls;
> - replace functions with safe_macros to check the return value in kernel/syscalls.
These two would be really better to put 2 commits.

Kind regards,
Petr

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

* [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros
  2021-05-11  6:32   ` Petr Vorel
@ 2021-05-11  8:37     ` Xie Ziyao
  0 siblings, 0 replies; 7+ messages in thread
From: Xie Ziyao @ 2021-05-11  8:37 UTC (permalink / raw)
  To: ltp

Hi, Petr,

>> - modify some incorrect use of TERRNO/TTERRNO in kernel/syscalls;
I just re-checked the latest code and submit the v2 version.

Please see: 
https://patchwork.ozlabs.org/project/ltp/patch/20210511082644.110124-1-xieziyao@huawei.com/

>> - replace functions with safe_macros to check the return value in kernel/syscalls.
As for this type of modification, I'll try to use script to replace all 
of them.

> These two would be really better to put 2 commits.
> 
> Kind regards,
> Petr
> .
> 

Thanks for your review.

Kind Regards,
Ziyao

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

* [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code
  2021-05-11  6:31   ` Petr Vorel
@ 2021-05-12  8:51     ` Xie Ziyao
  0 siblings, 0 replies; 7+ messages in thread
From: Xie Ziyao @ 2021-05-12  8:51 UTC (permalink / raw)
  To: ltp

Hi, Petr,

> Next time it'd be better to separate these changes - put Makefile changes into
> separate commit and ideally use script to replace all of them.
For all the testsuite that has used SPDX, I've also used script and 
shell commands to modify its Makefile to use SPDX.

Please take a look at this patch: 
https://patchwork.ozlabs.org/project/ltp/patch/20210512084904.35159-1-xieziyao@huawei.com/

Kind Regards,
Ziyao

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

end of thread, other threads:[~2021-05-12  8:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-02  3:46 [LTP] [PATCH 0/2] cleanup: Modify incorrect use of test macros and annotation style Xie Ziyao
2021-04-02  3:46 ` [LTP] [PATCH 1/2] kernel/syscalls: Modify incorrect use of TERRNO and replace functions with safe_macros Xie Ziyao
2021-05-11  6:32   ` Petr Vorel
2021-05-11  8:37     ` Xie Ziyao
2021-04-02  3:46 ` [LTP] [PATCH 2/2] kernel/syscalls: Unify the annotation style and remove Redundant code Xie Ziyao
2021-05-11  6:31   ` Petr Vorel
2021-05-12  8:51     ` Xie Ziyao

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.