inotify_init1_01.c: Convert to new LTP API
PATCH 1/2 inotify_init1_01.c: Convert to new LTP API
--- .../syscalls/inotify_init/inotify_init1_01.c | 203 +++--------------- 1 file changed, 35 insertions(+), 168 deletions(-)
testcases/kernel/syscalls/inotify_init/inotify_init1_01.c +35 -168
@@ -1,175 +1,42 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) Ulrich Drepper <[email protected]> */ -/* Copyright (c) International Business Machines Corp., 2009 */ -/* */ -/* 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, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/******************************************************************************/ -/******************************************************************************/ -/* */ -/* File: inotify_init1_01.c */ -/* */ -/* Description: This Program tests the new system call introduced in 2.6.27. */ -/* Ulrich´s comment as in: */ -/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4006553b06306b34054529477b06b68a1c66249b */ -/* says: */ -/* This patch introduces the new syscall inotify_init1 (note: the 1 stands for*/ -/* the one parameter the syscall takes, as opposed to no parameter before). */ -/* The values accepted for this parameter are function-specific and defined in*/ -/* the inotify.h header. Here the values must match the O_* flags, though. */ -/* In this patch CLOEXEC support is introduced. */ -/* The following test must be adjusted for architectures other */ -/* than x86 and x86-64 and in case the syscall numbers changed. */ -/* */ -/* Usage: <for command-line> */ -/* inotify_init1_01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ -/* where, -c n : Run n copies concurrently. */ -/* -e : Turn on errno logging. */ -/* -i n : Execute test n times. */ -/* -I x : Execute test for x seconds. */ -/* -P x : Pause for x seconds between iterations. */ -/* -t : Turn on syscall timing. */ -/* */ -/* Total Tests: 1 */ -/* */ -/* Test Name: inotify_init1_01 */ -/* */ -/* Author: Ulrich Drepper <[email protected]> */ -/* */ -/* History: Created - Jan 13 2009 - Ulrich Drepper <[email protected]> */ -/* Ported to LTP */ -/* - Jan 13 2009 - Subrata <[email protected]> */ -/******************************************************************************/ -#include <stdio.h> -#include <unistd.h> -#include <sys/syscall.h> -#include <errno.h> - -#include "test.h" -#include "lapi/fcntl.h" +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) Ulrich Drepper <[email protected]> +* Copyright (c) International Business Machines Corp., 2009 +* Ported to LTP - Jan 13 2009 - Subrata <[email protected]> +* Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]> +*/ + +/*\ +* [Description] +* +* Verify that inotify_init1() returns a file descriptor and sets +* the close-on-exec (FD_CLOEXEC) flag on the new file descriptor +* only when called with IN_CLOEXEC. +*/ + +#include "tst_test.h" #include "lapi/syscalls.h" #define IN_CLOEXEC O_CLOEXEC -char *TCID ="inotify_init1_01" ; -int testno; -int TST_TOTAL =1 ; - -/* Extern Global Functions */ -/******************************************************************************/ -/* */ -/* Function: cleanup */ -/* */ -/* Description: Performs all one time clean up for this test on successful */ -/* completion, premature exit or failure. Closes all temporary */ -/* files, removes all temporary directories exits the test with */ -/* appropriate return code by calling tst_exit() function. */ -/* */ -/* Input: None. */ -/* */ -/* Output: None. */ -/* */ -/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ -/* On success - Exits calling tst_exit(). With '0' return code. */ -/* */ -/******************************************************************************/ -void cleanup (void ) -{ - -tst_rmdir (); -} - -/* Local Functions */ -/******************************************************************************/ -/* */ -/* Function: setup */ -/* */ -/* Description: Performs all one time setup for this test. This function is */ -/* typically used to capture signals, create temporary dirs */ -/* and temporary files that may be used in the course of this */ -/* test. */ -/* */ -/* Input: None. */ -/* */ -/* Output: None. */ -/* */ -/* Return: On failure - Exits by calling cleanup(). */ -/* On success - returns 0. */ -/* */ -/******************************************************************************/ -void setup (void ) +static void run (void ) { -/* Capture signals if any */ -/* Create temporary directories */ -TEST_PAUSE ; -tst_tmpdir (); +int fd, fd_flags; + +TST_EXP_FD (tst_syscall (__NR_inotify_init1,0 )); + fd =TST_RET ; + fd_flags =SAFE_FCNTL (fd,F_GETFD ); +TST_EXP_EQ_LI (fd_flags &FD_CLOEXEC ,0 ); +SAFE_CLOSE (fd); + +TST_EXP_FD (tst_syscall (__NR_inotify_init1,IN_CLOEXEC )); + fd =TST_RET ; + fd_flags =SAFE_FCNTL (fd,F_GETFD ); +TST_EXP_EQ_LI (fd_flags &FD_CLOEXEC ,FD_CLOEXEC ); +SAFE_CLOSE (fd); } -int main (int argc,char *argv[]) -{ -int fd, coe; -int lc; - -tst_parse_opts (argc, argv,NULL ,NULL ); - -if ((tst_kvercmp (2 ,6 ,27 )) <0 ) { -tst_brkm (TCONF ,NULL , -"This test can only run on kernels that are 2.6.27 " -"and higher" ); - } -setup (); - -for (lc =0 ;TEST_LOOPING (lc); ++lc) { - tst_count =0 ; -for (testno =0 ; testno <TST_TOTAL ; ++testno) { - fd =tst_syscall (__NR_inotify_init1,0 ); -if (fd ==-1 ) { -tst_brkm (TFAIL |TERRNO , cleanup, -"inotify_init1(0) failed" ); - } - coe =fcntl (fd,F_GETFD ); -if (coe ==-1 ) { -tst_brkm (TBROK |TERRNO , cleanup, -"fcntl failed" ); - } -if (coe &FD_CLOEXEC ) { -tst_brkm (TFAIL , cleanup, -"inotify_init1(0) set close-on-exit" ); - } -close (fd); - - fd =tst_syscall (__NR_inotify_init1,IN_CLOEXEC ); -if (fd ==-1 ) { -tst_brkm (TFAIL |TERRNO , cleanup, -"inotify_init1(IN_CLOEXEC) failed" ); - } - coe =fcntl (fd,F_GETFD ); -if (coe ==-1 ) { -tst_resm (TBROK |TERRNO ,"fcntl failed" ); - }else if ((coe &FD_CLOEXEC ) ==0 ) { -tst_resm (TFAIL , -"inotify_init1(O_CLOEXEC) did not " -"set close-on-exit" ); - }else { -close (fd); -tst_resm (TPASS ,"inotify_init1(O_CLOEXEC) " -"PASSED" ); - } - } - } -tst_exit (); -cleanup (); -} +static struct tst_test test = { + .test_all = run, + .needs_tmpdir =1 +};
Signature · 5 lines
2.37.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/2 inotify_init1_02.c: Convert to new LTP API
--- .../syscalls/inotify_init/inotify_init1_02.c | 200 +++--------------- 1 file changed, 35 insertions(+), 165 deletions(-)
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c +35 -165
@@ -1,172 +1,42 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) Ulrich Drepper <[email protected]> */ -/* Copyright (c) International Business Machines Corp., 2009 */ -/* */ -/* 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, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/******************************************************************************/ -/******************************************************************************/ -/* */ -/* File: inotify_init1_02.c */ -/* */ -/* Description: This Program tests the new system call introduced in 2.6.27. */ -/* Ulrich´s comment as in: */ -/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=510df2dd482496083e1c3b1a8c9b6afd5fa4c7d7 */ -/* which says: */ -/* This patch adds non-blocking support for inotify_init1. The additional */ -/* changes needed are minimal. The following test must be adjusted for */ -/* architectures other than x86 and x86-64 and in case the syscall numbers */ -/* changed. */ -/* */ -/* Usage: <for command-line> */ -/* inotify_init1_02 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ -/* where, -c n : Run n copies concurrently. */ -/* -e : Turn on errno logging. */ -/* -i n : Execute test n times. */ -/* -I x : Execute test for x seconds. */ -/* -P x : Pause for x seconds between iterations. */ -/* -t : Turn on syscall timing. */ -/* */ -/* Total Tests: 1 */ -/* */ -/* Test Name: inotify_init1_02 */ -/* */ -/* Author: Ulrich Drepper <[email protected]> */ -/* */ -/* History: Created - Jan 13 2009 - Ulrich Drepper <[email protected]> */ -/* Ported to LTP */ -/* - Jan 13 2009 - Subrata <[email protected]> */ -/******************************************************************************/ -#include <stdio.h> -#include <unistd.h> -#include <sys/syscall.h> -#include <errno.h> - -#include "test.h" -#include "lapi/fcntl.h" +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) Ulrich Drepper <[email protected]> +* Copyright (c) International Business Machines Corp., 2009 +* Ported to LTP - Jan 13 2009 - Subrata <[email protected]> +* Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]> +*/ + +/*\ +* [Description] +* +* Verify that inotify_init1() returns a file descriptor and sets the +* O_NONBLOCK file status flag on the open file description referred +* to by the new file descriptor only when called with IN_NONBLOCK. +*/ + +#include "tst_test.h" #include "lapi/syscalls.h" #define IN_NONBLOCK O_NONBLOCK -char *TCID ="inotify_init1_02" ; -int testno; -int TST_TOTAL =1 ; - -/* Extern Global Functions */ -/******************************************************************************/ -/* */ -/* Function: cleanup */ -/* */ -/* Description: Performs all one time clean up for this test on successful */ -/* completion, premature exit or failure. Closes all temporary */ -/* files, removes all temporary directories exits the test with */ -/* appropriate return code by calling tst_exit() function. */ -/* */ -/* Input: None. */ -/* */ -/* Output: None. */ -/* */ -/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ -/* On success - Exits calling tst_exit(). With '0' return code. */ -/* */ -/******************************************************************************/ -void cleanup (void ) -{ - -tst_rmdir (); -} - -/* Local Functions */ -/******************************************************************************/ -/* */ -/* Function: setup */ -/* */ -/* Description: Performs all one time setup for this test. This function is */ -/* typically used to capture signals, create temporary dirs */ -/* and temporary files that may be used in the course of this */ -/* test. */ -/* */ -/* Input: None. */ -/* */ -/* Output: None. */ -/* */ -/* Return: On failure - Exits by calling cleanup(). */ -/* On success - returns 0. */ -/* */ -/******************************************************************************/ -void setup (void ) +static void run (void ) { -/* Capture signals if any */ -/* Create temporary directories */ -TEST_PAUSE ; -tst_tmpdir (); +int fd, flags; + +TST_EXP_FD (tst_syscall (__NR_inotify_init1,0 )); + fd =TST_RET ; + flags =SAFE_FCNTL (fd,F_GETFL ); +TST_EXP_EQ_LI (flags &O_NONBLOCK ,0 ); +SAFE_CLOSE (fd); + +TST_EXP_FD (tst_syscall (__NR_inotify_init1,IN_NONBLOCK )); + fd =TST_RET ; + flags =SAFE_FCNTL (fd,F_GETFL ); +TST_EXP_EQ_LI (flags &O_NONBLOCK ,O_NONBLOCK ); +SAFE_CLOSE (fd); } -int main (int argc,char *argv[]) -{ -int fd, fl; -int lc; - -tst_parse_opts (argc, argv,NULL ,NULL ); - -if ((tst_kvercmp (2 ,6 ,27 )) <0 ) { -tst_brkm (TCONF ,NULL , -"This test can only run on kernels that are 2.6.27 " -"and higher" ); - } -setup (); - -for (lc =0 ;TEST_LOOPING (lc); ++lc) { - tst_count =0 ; -for (testno =0 ; testno <TST_TOTAL ; ++testno) { - fd =tst_syscall (__NR_inotify_init1,0 ); -if (fd ==-1 ) { -tst_brkm (TFAIL |TERRNO , cleanup, -"inotify_init1(0) failed" ); - } - fl =fcntl (fd,F_GETFL ); -if (fl ==-1 ) { -tst_brkm (TBROK |TERRNO , cleanup, -"fcntl failed" ); - } -if (fl &O_NONBLOCK ) { -tst_brkm (TFAIL , cleanup, -"inotify_init1(0) set non-blocking " -"mode" ); - } -close (fd); - - fd =tst_syscall (__NR_inotify_init1,IN_NONBLOCK ); -if (fd ==-1 ) { -tst_brkm (TFAIL |TERRNO , cleanup, -"inotify_init1(IN_NONBLOCK) failed" ); - } - fl =fcntl (fd,F_GETFL ); -if (fl ==-1 ) { -tst_brkm (TBROK |TERRNO , cleanup, -"fcntl failed" ); - } -if ((fl &O_NONBLOCK ) ==0 ) { -tst_brkm (TFAIL , cleanup, -"inotify_init1(IN_NONBLOCK) set " -"non-blocking mode" ); - } -close (fd); -tst_resm (TPASS ,"inotify_init1(IN_NONBLOCK) PASSED" ); - } - } -tst_exit (); -} +static struct tst_test test = { + .test_all = run, + .needs_tmpdir =1 +};
Signature · 5 lines
2.37.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH 2/2] inotify_init1_02.c: Convert to new LTP API
Hello,
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c line 41
Quoted 4 lines
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c +3
-1-} +static struct tst_test test = { + .test_all = run, + .needs_tmpdir =1
Both conversions look perfect, but do we need a temp dir? It doesn't look like the tests use the file system.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH 2/2] inotify_init1_02.c: Convert to new LTP API
Hi Richie,
Quoted 9 lines · IST Richard Palethorpe
Hello,
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c line 41
Quoted 4 lines
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c +3
-1-} +static struct tst_test test = { + .test_all = run, + .needs_tmpdir =1 Both conversions look perfect, but do we need a temp dir? It doesn't look like the tests use the file system.
Yes, my bad. No need of temp dir.
Should I send updated patch or will you update before merging?
Quoted 2 lines
Thanks,
Avinesh
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH 2/2] inotify_init1_02.c: Convert to new LTP API
Hello,
Quoted 12 lines · Avinesh Kumar
Hi Richie,
Quoted 9 lines · IST Richard Palethorpe
Hello,
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c line 41
Quoted 4 lines
testcases/kernel/syscalls/inotify_init/inotify_init1_02.c +3
-1-} +static struct tst_test test = { + .test_all = run, + .needs_tmpdir =1 Both conversions look perfect, but do we need a temp dir? It doesn't look like the tests use the file system.
Quoted 2 lines
Yes, my bad. No need of temp dir.
Should I send updated patch or will you update before merging?
OK, I'll update before merging, thanks.
Quoted 5 lines
Quoted 2 lines
Thanks,
Avinesh
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp