epoll_pwait_var.h: check for syscall availability
PATCH 1/1 epoll_pwait_var.h: check for syscall availability
Check that epoll_pwait or epoll_pwait2 is available before running the corresponding test.
Signed-off-by Edward Liaw <[email protected]>
--- .../kernel/syscalls/epoll_pwait/epoll_pwait01.c | 13 ++----------- .../kernel/syscalls/epoll_pwait/epoll_pwait02.c | 2 +- .../kernel/syscalls/epoll_pwait/epoll_pwait03.c | 2 +- .../kernel/syscalls/epoll_pwait/epoll_pwait04.c | 2 +- .../kernel/syscalls/epoll_pwait/epoll_pwait05.c | 2 ++ .../kernel/syscalls/epoll_pwait/epoll_pwait_var.h | 9 ++++++--- 6 files changed, 13 insertions(+), 17 deletions(-)
testcases/kernel/syscalls/epoll_pwait/epoll_pwait01.c +2 -11
@@ -73,16 +73,10 @@ static void run(unsigned int n)tst_reap_children (); } -static void epoll_pwait_support (void ) -{ -if (tst_variant ==0 ) -epoll_pwait_supported (); -else -epoll_pwait2_supported (); -} -static void setup (void ) { +epoll_pwait_init (); +SAFE_SIGEMPTYSET (&signalset);SAFE_SIGADDSET (&signalset,SIGUSR1 );
@@ -91,9 +85,6 @@ static void setup(void)SAFE_SIGEMPTYSET (&sa.sa_mask);SAFE_SIGACTION (SIGUSR1 , &sa,NULL ); -epoll_pwait_info (); -epoll_pwait_support (); -SAFE_SOCKETPAIR (AF_UNIX ,SOCK_STREAM ,0 , sfd); efd =epoll_create (1 );
testcases/kernel/syscalls/epoll_pwait/epoll_pwait02.c +1 -1
@@ -32,7 +32,7 @@ static void run(void)static void setup (void ) { -epoll_pwait_info (); +epoll_pwait_init ();SAFE_SOCKETPAIR (AF_UNIX ,SOCK_STREAM ,0 , sfd);
testcases/kernel/syscalls/epoll_pwait/epoll_pwait03.c +1 -1
@@ -40,7 +40,7 @@ int sample_fn(int clk_id, long long usec)static void setup (void ) { -epoll_pwait_info (); +epoll_pwait_init ();SAFE_SOCKETPAIR (AF_UNIX ,SOCK_STREAM ,0 , sfd);
testcases/kernel/syscalls/epoll_pwait/epoll_pwait04.c +1 -1
@@ -28,7 +28,7 @@ static void run(void)static void setup (void ) { -epoll_pwait_info (); +epoll_pwait_init ();SAFE_SOCKETPAIR (AF_UNIX ,SOCK_STREAM ,0 , sfd);
testcases/kernel/syscalls/epoll_pwait/epoll_pwait05.c +2 -0
@@ -38,6 +38,8 @@ static void run_all(unsigned int n)static void setup (void ) { +epoll_pwait2_supported (); +SAFE_SOCKETPAIR (AF_UNIX ,SOCK_STREAM ,0 , sfd); efd =epoll_create (1 );
testcases/kernel/syscalls/epoll_pwait/epoll_pwait_var.h +6 -3
@@ -32,12 +32,15 @@ static int do_epoll_pwait(int epfd, struct epoll_event *events, int } -static void epoll_pwait_info (void ) +static void epoll_pwait_init (void ) { -if (tst_variant ==0 ) +if (tst_variant ==0 ) {tst_res (TINFO ,"Test epoll_pwait()" ); -else +epoll_pwait_supported (); + }else {tst_res (TINFO ,"Test epoll_pwait2()" ); +epoll_pwait2_supported (); + } }#endif /* LTP_EPOLL_PWAIT_VAR_H */
Signature · 5 lines
2.42.0.rc1.204.g551eb34607-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Applied, thanks.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp