[LTP] [PATCH v2] bugfix for testcases which with duplicate header files fcntl.h
xuyang2018.jy@fujitsu.com
xuyang2018.jy@fujitsu.com
Fri Dec 3 04:56:06 CET 2021
Hi Wen
When I plan to merge this patch into ltp, it reports error as below:
[root@localhost ltp]# git am
v2-bugfix-for-testcases-which-with-duplicate-header-files-fcntl.h.patch
Applying: bugfix for testcases which with duplicate header files fcntl.h
error: corrupt patch at line 111
Patch failed at 0001 bugfix for testcases which with duplicate header
files fcntl.h
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[root@localhost ltp
Do you rebase on lastest ltp or use git format-patch to generate patch?
ps: This patch doesn't fix any bug, I would like to use
"testcase: Remove duplicate fcntl.h" subject.
Best Regards
Yang Xu
> testcases/kernel/syscalls:Remove duplicate header files fcntl.h.
>
> Signed-off-by: Yehai Wen<wenyehai@huawei.com>
> ---
> v1->v2: remove duplicate header files fcntl.h for all testcases
> testcases/kernel/syscalls/accept4/accept4_01.c | 1 -
> testcases/kernel/syscalls/eventfd2/eventfd2_01.c | 1 -
> testcases/kernel/syscalls/eventfd2/eventfd2_02.c | 1 -
> testcases/kernel/syscalls/execveat/execveat03.c | 1 -
> testcases/kernel/syscalls/fallocate/fallocate01.c | 1 -
> testcases/kernel/syscalls/fchownat/fchownat01.c | 1 -
> testcases/kernel/syscalls/fchownat/fchownat02.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl29.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl30.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl31.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl34.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl35.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl36.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl37.c | 1 -
> testcases/kernel/syscalls/fcntl/fcntl38.c | 1 -
> testcases/kernel/syscalls/inotify_init/inotify_init1_01.c | 1 -
> testcases/kernel/syscalls/inotify_init/inotify_init1_02.c | 1 -
> testcases/kernel/syscalls/linkat/linkat02.c | 1 -
> testcases/kernel/syscalls/mknodat/mknodat01.c | 1 -
> testcases/kernel/syscalls/mknodat/mknodat02.c | 1 -
> testcases/kernel/syscalls/open/open14.c | 1 -
> testcases/kernel/syscalls/openat/openat01.c | 1 -
> testcases/kernel/syscalls/openat/openat02.c | 1 -
> testcases/kernel/syscalls/openat/openat03.c | 1 -
> testcases/kernel/syscalls/pipe/pipe12.c | 1 -
> testcases/kernel/syscalls/pipe2/pipe2_04.c | 1 -
> testcases/kernel/syscalls/renameat/renameat01.c | 1 -
> testcases/kernel/syscalls/signalfd4/signalfd4_01.c | 1 -
> testcases/kernel/syscalls/socket/socket02.c | 1 -
> testcases/kernel/syscalls/socketpair/socketpair02.c | 1 -
> testcases/kernel/syscalls/tee/tee01.c | 1 -
> testcases/kernel/syscalls/timerfd/timerfd02.c | 1 -
> testcases/kernel/syscalls/timerfd/timerfd03.c | 1 -
> testcases/kernel/syscalls/vmsplice/vmsplice01.c | 1 -
> testcases/kernel/syscalls/vmsplice/vmsplice02.c | 2 --
> 35 files changed, 36 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
> index b3ab1b9..58115ea 100644
> --- a/testcases/kernel/syscalls/accept4/accept4_01.c
> +++ b/testcases/kernel/syscalls/accept4/accept4_01.c
> @@ -13,7 +13,6 @@
> #include<sys/socket.h>
> #include<netinet/in.h>
> #include<stdlib.h>
> -#include<fcntl.h>
> #include<stdio.h>
> #include<string.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
> index a4af388..c0c6a26 100644
> --- a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
> +++ b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
> @@ -53,7 +53,6 @@
> /* Ported to LTP */
> /* - Jan 08 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<unistd.h>
> #include<sys/syscall.h>
> diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2_02.c b/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
> index 151edb8..418c07c 100644
> --- a/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
> +++ b/testcases/kernel/syscalls/eventfd2/eventfd2_02.c
> @@ -50,7 +50,6 @@
> /* Ported to LTP */
> /* - Jan 13 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<unistd.h>
> #include<sys/syscall.h>
> diff --git a/testcases/kernel/syscalls/execveat/execveat03.c b/testcases/kernel/syscalls/execveat/execveat03.c
> index 78b26ab..1900c07 100644
> --- a/testcases/kernel/syscalls/execveat/execveat03.c
> +++ b/testcases/kernel/syscalls/execveat/execveat03.c
> @@ -29,7 +29,6 @@
> #include<string.h>
> #include<sys/syscall.h>
> #include<sys/mount.h>
> -#include<fcntl.h>
> #include "tst_test.h"
> #include "lapi/execveat.h"
> #include "lapi/fcntl.h"
> diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
> index c60e160..383796c 100644
> --- a/testcases/kernel/syscalls/fallocate/fallocate01.c
> +++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
> @@ -93,7 +93,6 @@
> #include<errno.h>
> #include<sys/stat.h>
> #include<sys/types.h>
> -#include<fcntl.h>
> #include<sys/syscall.h>
> #include<unistd.h>
> #include<inttypes.h>
> diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
> index 9f4ecde..a658f07 100644
> --- a/testcases/kernel/syscalls/fchownat/fchownat01.c
> +++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
> @@ -26,7 +26,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<unistd.h>
> #include<stdlib.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c
> index d19f3f3..701623d 100644
> --- a/testcases/kernel/syscalls/fchownat/fchownat02.c
> +++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
> @@ -24,7 +24,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<unistd.h>
> #include<stdlib.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl29.c b/testcases/kernel/syscalls/fcntl/fcntl29.c
> index ffb9fea..5874764 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl29.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl29.c
> @@ -24,7 +24,6 @@
> #include<stdio.h>
> #include<errno.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<string.h>
> #include<signal.h>
> #include<sys/types.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl30.c b/testcases/kernel/syscalls/fcntl/fcntl30.c
> index a7a5e13..27f4643 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl30.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl30.c
> @@ -25,7 +25,6 @@
> #include<stdio.h>
> #include<errno.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<string.h>
> #include<signal.h>
> #include<sys/types.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl31.c b/testcases/kernel/syscalls/fcntl/fcntl31.c
> index fd284fd..9003089 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl31.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl31.c
> @@ -25,7 +25,6 @@
> #include<stdio.h>
> #include<errno.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<string.h>
> #include<signal.h>
> #include<sys/types.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl34.c b/testcases/kernel/syscalls/fcntl/fcntl34.c
> index 3a68b51..3442114 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl34.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl34.c
> @@ -7,7 +7,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<pthread.h>
> #include<sched.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl35.c b/testcases/kernel/syscalls/fcntl/fcntl35.c
> index c5a071d..8eb7148 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl35.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl35.c
> @@ -26,7 +26,6 @@
> #include<sys/types.h>
> #include<pwd.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<stdlib.h>
> #include "lapi/fcntl.h"
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c
> index 1d187c2..d6b07fc 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl36.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl36.c
> @@ -34,7 +34,6 @@
> #include<unistd.h>
> #include<stdio.h>
> #include<stdlib.h>
> -#include<fcntl.h>
> #include<pthread.h>
> #include<sched.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl37.c b/testcases/kernel/syscalls/fcntl/fcntl37.c
> index c52af22..a624554 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl37.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl37.c
> @@ -14,7 +14,6 @@
> */
> #include<unistd.h>
> -#include<fcntl.h>
> #include<sys/types.h>
> #include<limits.h>
> #include<stdlib.h>
> diff --git a/testcases/kernel/syscalls/fcntl/fcntl38.c b/testcases/kernel/syscalls/fcntl/fcntl38.c
> index fae2ab4..2f1b022 100644
> --- a/testcases/kernel/syscalls/fcntl/fcntl38.c
> +++ b/testcases/kernel/syscalls/fcntl/fcntl38.c
> @@ -8,7 +8,6 @@
> * Check that dnotify event is reported to both parent and subdir
> */
> -#include<fcntl.h>
> #include<signal.h>
> #include<stdio.h>
> #include<unistd.h>
> diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
> index f1203a4..f1b50fd 100644
> --- a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
> +++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
> @@ -53,7 +53,6 @@
> /* Ported to LTP */
> /* - Jan 13 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<unistd.h>
> #include<sys/syscall.h>
> diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
> index b074214..3b0c767 100644
> --- a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
> +++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
> @@ -50,7 +50,6 @@
> /* Ported to LTP */
> /* - Jan 13 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<unistd.h>
> #include<sys/syscall.h>
> diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c
> index 84b4a3b..566c76b 100644
> --- a/testcases/kernel/syscalls/linkat/linkat02.c
> +++ b/testcases/kernel/syscalls/linkat/linkat02.c
> @@ -21,7 +21,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<unistd.h>
> #include<stdlib.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
> index 2e13c77..bff2c6a 100644
> --- a/testcases/kernel/syscalls/mknodat/mknodat01.c
> +++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
> @@ -27,7 +27,6 @@
> #define _GNU_SOURCE
> #include<sys/types.h>
> -#include<fcntl.h>
> #include<sys/stat.h>
> #include<stdlib.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c
> index 6c5054b..7e6afda 100644
> --- a/testcases/kernel/syscalls/mknodat/mknodat02.c
> +++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
> @@ -27,7 +27,6 @@
> #define _GNU_SOURCE
> #include<sys/types.h>
> -#include<fcntl.h>
> #include<sys/stat.h>
> #include<stdlib.h>
> #include<errno.h>
> diff --git a/testcases/kernel/syscalls/open/open14.c b/testcases/kernel/syscalls/open/open14.c
> index 0d832cb..f78a364 100644
> --- a/testcases/kernel/syscalls/open/open14.c
> +++ b/testcases/kernel/syscalls/open/open14.c
> @@ -22,7 +22,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<errno.h>
> #include "test.h"
> diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
> index 0441c3a..daed419 100644
> --- a/testcases/kernel/syscalls/openat/openat01.c
> +++ b/testcases/kernel/syscalls/openat/openat01.c
> @@ -28,7 +28,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<stdlib.h>
> #include<errno.h>
> #include<string.h>
> diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c
> index e2eefda..2ce1190 100644
> --- a/testcases/kernel/syscalls/openat/openat02.c
> +++ b/testcases/kernel/syscalls/openat/openat02.c
> @@ -38,7 +38,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<unistd.h>
> #include<sys/wait.h>
> #include<stdlib.h>
> diff --git a/testcases/kernel/syscalls/openat/openat03.c b/testcases/kernel/syscalls/openat/openat03.c
> index 7e816f2..2846fd0 100644
> --- a/testcases/kernel/syscalls/openat/openat03.c
> +++ b/testcases/kernel/syscalls/openat/openat03.c
> @@ -22,7 +22,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<errno.h>
> #include "test.h"
> diff --git a/testcases/kernel/syscalls/pipe/pipe12.c b/testcases/kernel/syscalls/pipe/pipe12.c
> index 4c7eda2..f524040 100644
> --- a/testcases/kernel/syscalls/pipe/pipe12.c
> +++ b/testcases/kernel/syscalls/pipe/pipe12.c
> @@ -11,7 +11,6 @@
> #define _GNU_SOURCE
> #include<unistd.h>
> #include<stdlib.h>
> -#include<fcntl.h>
> #include "tst_test.h"
> #include "lapi/fcntl.h"
> diff --git a/testcases/kernel/syscalls/pipe2/pipe2_04.c b/testcases/kernel/syscalls/pipe2/pipe2_04.c
> index 432007e..3789435 100644
> --- a/testcases/kernel/syscalls/pipe2/pipe2_04.c
> +++ b/testcases/kernel/syscalls/pipe2/pipe2_04.c
> @@ -11,7 +11,6 @@
> #define _GNU_SOURCE
> #include<stdlib.h>
> #include<features.h>
> -#include<fcntl.h>
> #include<unistd.h>
> #include<stdio.h>
> #include "lapi/fcntl.h"
> diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
> index 817e217..9df4b70 100644
> --- a/testcases/kernel/syscalls/renameat/renameat01.c
> +++ b/testcases/kernel/syscalls/renameat/renameat01.c
> @@ -41,7 +41,6 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> #include<sys/time.h>
> -#include<fcntl.h>
> #include<stdlib.h>
> #include<errno.h>
> #include<string.h>
> diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
> index 9f85973..960c7ce 100644
> --- a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
> +++ b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
> @@ -54,7 +54,6 @@
> /* Ported to LTP */
> /* - Jan 08 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<signal.h>
> #include<stdio.h>
> #include<unistd.h>
> diff --git a/testcases/kernel/syscalls/socket/socket02.c b/testcases/kernel/syscalls/socket/socket02.c
> index afe9dc1..59fd942 100644
> --- a/testcases/kernel/syscalls/socket/socket02.c
> +++ b/testcases/kernel/syscalls/socket/socket02.c
> @@ -12,7 +12,6 @@
> * in socket() in kernel 2.6.27.
> */
> -#include<fcntl.h>
> #include<stdio.h>
> #include<unistd.h>
> #include<netinet/in.h>
> diff --git a/testcases/kernel/syscalls/socketpair/socketpair02.c b/testcases/kernel/syscalls/socketpair/socketpair02.c
> index 72ca0e8..e23945c 100644
> --- a/testcases/kernel/syscalls/socketpair/socketpair02.c
> +++ b/testcases/kernel/syscalls/socketpair/socketpair02.c
> @@ -13,7 +13,6 @@
> */
> #include<errno.h>
> -#include<fcntl.h>
> #include<pthread.h>
> #include<stdio.h>
> #include<unistd.h>
> diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
> index db2ac1e..cee6ed7 100644
> --- a/testcases/kernel/syscalls/tee/tee01.c
> +++ b/testcases/kernel/syscalls/tee/tee01.c
> @@ -11,7 +11,6 @@
> #include<string.h>
> #include<signal.h>
> #include<sys/types.h>
> -#include<fcntl.h>
> #include "tst_test.h"
> #include "lapi/fcntl.h"
> diff --git a/testcases/kernel/syscalls/timerfd/timerfd02.c b/testcases/kernel/syscalls/timerfd/timerfd02.c
> index c544406..88742b8 100644
> --- a/testcases/kernel/syscalls/timerfd/timerfd02.c
> +++ b/testcases/kernel/syscalls/timerfd/timerfd02.c
> @@ -54,7 +54,6 @@
> /* - Jan 08 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<time.h>
> #include<unistd.h>
> diff --git a/testcases/kernel/syscalls/timerfd/timerfd03.c b/testcases/kernel/syscalls/timerfd/timerfd03.c
> index e288251..41aa946 100644
> --- a/testcases/kernel/syscalls/timerfd/timerfd03.c
> +++ b/testcases/kernel/syscalls/timerfd/timerfd03.c
> @@ -50,7 +50,6 @@
> /* Ported to LTP */
> /* - Jan 13 2009 - Subrata<subrata@linux.vnet.ibm.com> */
> /******************************************************************************/
> -#include<fcntl.h>
> #include<stdio.h>
> #include<time.h>
> #include<unistd.h>
> diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
> index 1d1b66d..36ecc08 100644
> --- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c
> +++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
> @@ -11,7 +11,6 @@
> #include<string.h>
> #include<signal.h>
> #include<sys/types.h>
> -#include<fcntl.h>
> #include<sys/poll.h>
> #include "tst_test.h"
> diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice02.c b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
> index 39c407c..0135b6f 100644
> --- a/testcases/kernel/syscalls/vmsplice/vmsplice02.c
> +++ b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
> @@ -18,9 +18,7 @@
> #include<sys/types.h>
> #include<sys/stat.h>
> -#include<fcntl.h>
> #include<unistd.h>
> -#include<fcntl.h>
> #include<sys/uio.h>
> #include<limits.h>
> 2.7.4
>
More information about the ltp
mailing list