syscalls/read03: Convert to new API
PATCH 1/2 syscalls/read03: Convert to new API
Signed-off-by Shiyang Ruan <[email protected]>
--- testcases/kernel/syscalls/read/read03.c | 155 +++++------------------- 1 file changed, 33 insertions(+), 122 deletions(-)
testcases/kernel/syscalls/read/read03.c +33 -122
@@ -1,146 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* 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, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 */ -/* -* NAME -* read03.c -* -* DESCRIPTION -* Testcase to check that read() sets errno to EAGAIN -* -* ALGORITHM -* Create a named pipe (fifo), open it in O_NONBLOCK mode, and -* attempt to read from it, without writing to it. read() should fail -* with EAGAIN. -* -* USAGE: <for command-line> -* read03 [-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. +/*\ +* [DESCRIPTION] * -* HISTORY -* 07/2001 Ported by Wayne Boyer -* -* RESTRICTIONS -* NONE +* Testcase to check if read() successfully sets errno to EAGAIN when read from +* a pipe(fifo, opened in O_NONBLOCK mode) without writing to it. */ -#include <sys/stat.h> -#include <fcntl.h> -#include <signal.h> -#include <errno.h> -#include "test.h" -char *TCID ="read03" ; -int TST_TOTAL =1 ; - -char fifo[100 ] ="fifo" ; -int rfd, wfd; -struct stat buf; +#include <stdio.h> +#include <fcntl.h> +#include "tst_test.h" -void alarm_handler (); -void setup (); -void cleanup (); +static char fifo[100 ]; +static int rfd, wfd; -int main (int ac,char **av) +static void verify_read (void ) { -int lc; -int c; -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -/* -* The following loop checks looping state if -i option given -*/ -for (lc =0 ;TEST_LOOPING (lc); lc++) { -/* reset tst_count in case we are looping */ - tst_count =0 ; - -TEST (read (rfd, &c,1 )); - -if (TEST_RETURN !=-1 ) { -tst_resm (TFAIL ,"read() failed to fail when nothing " -"is written to a pipe" ); -continue ; - } - -if (TEST_ERRNO !=EAGAIN ) { -tst_resm (TFAIL ,"read set bad errno, expected " -"EAGAIN, got %d" ,TEST_ERRNO ); - }else { -tst_resm (TPASS ,"read() succeded in setting errno to " -"EAGAIN" ); - } - } -cleanup (); -tst_exit (); - +TST_EXP_FAIL (read (rfd, &c,1 ),EAGAIN , +"read() when nothing is written to a pipe" ); } -/* -* setup() - performs all ONE TIME setup for this test -*/ -void setup (void ) +static void setup (void ) { +struct stat buf; -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -/* create a temporary filename */ -sprintf (fifo,"%s.%d" , fifo,getpid ()); +sprintf (fifo,"fifo.%d" ,getpid ()); -/* Create a temporary directory and cd to it */ -tst_tmpdir (); +SAFE_MKNOD (fifo,S_IFIFO |0777 ,0 ); +SAFE_STAT (fifo, &buf); -if (mknod (fifo,S_IFIFO |0777 ,0 ) <0 ) { -tst_brkm (TBROK , cleanup,"mknod() failed, errno: %d" , errno); - } -if (stat (fifo, &buf) !=0 ) { -tst_brkm (TBROK , cleanup,"stat() failed, errno: %d" , errno); - }if ((buf.st_mode &S_IFIFO ) ==0 ) { -tst_brkm (TBROK , cleanup,"Mode does not indicate fifo file" ); +tst_brk (TBROK ,"Mode does not indicate fifo file" ); } - rfd =open (fifo,O_RDONLY |O_NONBLOCK ); - wfd =open (fifo,O_WRONLY |O_NONBLOCK ); + rfd =SAFE_OPEN (fifo,O_RDONLY |O_NONBLOCK ); + wfd =SAFE_OPEN (fifo,O_WRONLY |O_NONBLOCK ); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { - -close (rfd); -close (wfd); -unlink (fifo); - -/* delete the test directory created in setup() */ -tst_rmdir (); - +SAFE_CLOSE (rfd); +SAFE_CLOSE (wfd); +SAFE_UNLINK (fifo); } + +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .cleanup = cleanup, + .test_all = verify_read, +};
Signature · 1 line
2.31.1
PATCH 2/2 syscalls/read04: Convert to new API
Signed-off-by Shiyang Ruan <[email protected]>
--- testcases/kernel/syscalls/read/read04.c | 157 +++++------------------- 1 file changed, 34 insertions(+), 123 deletions(-)
testcases/kernel/syscalls/read/read04.c +34 -123
@@ -1,150 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* 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, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 */ -/* -* NAME -* read04.c -* -* DESCRIPTION -* Testcase to check if read returns the number of bytes read correctly. -* -* ALGORITHM -* Create a file and write some bytes out to it. -* Attempt to read more than written. -* Check the return count, and the read buffer. The read buffer should be -* same as the write buffer. -* -* USAGE: <for command-line> -* read04 [-c n] [-f] [-i n] [-I x] [-P x] [-t] -* where, -c n : Run n copies concurrently. -* -f : Turn off functionality Testing. -* -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. -* -* HISTORY -* 07/2001 Ported by Wayne Boyer +/*\ +* [DESCRIPTION] * -* RESTRICTIONS -* None +* Testcase to check if read() returns the number of bytes read correctly. */ +#include <sys/types.h> #include <sys/stat.h> #include <stdio.h> #include <fcntl.h> -#include <errno.h> -#include "test.h" -#include "safe_macros.h" - -void cleanup (void ); -void setup (void ); - -char *TCID ="read04" ; -int TST_TOTAL =1 ; +#include "tst_test.h" #define TST_SIZE 27/* could also do strlen(palfa) */ -char fname[255 ]; -char palfa[] ="ABCDEFGHIJKLMNOPQRSTUVWXYZ" ; -int fild; +static char fname[255 ]; +static char palfa[] ="ABCDEFGHIJKLMNOPQRSTUVWXYZ" ; -int main (int ac,char **av) +static void verify_read (void ) { -int lc; - -int rfild; +int fd;char prbuf[BUFSIZ ]; -/* -* parse standard options -*/ -tst_parse_opts (ac, av,NULL ,NULL ); - -setup ();/* global setup for test */ - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ;/* reset tst_count while looping */ - -if ((rfild =open (fname,O_RDONLY )) ==-1 ) { -tst_brkm (TBROK , cleanup,"can't open for reading" ); - } -TEST (read (rfild, prbuf,BUFSIZ )); + fd =SAFE_OPEN (fname,O_RDONLY ); +TEST (read (fd, prbuf,BUFSIZ )); -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL ,"call failed unexpectedly" ); -continue ; - } - -if (TEST_RETURN !=TST_SIZE ) { -tst_resm (TFAIL ,"Bad read count - got %ld - " -"expected %d" ,TEST_RETURN ,TST_SIZE ); -continue ; - } -if (memcmp (palfa, prbuf,TST_SIZE ) !=0 ) { -tst_resm (TFAIL ,"read buffer not equal " -"to write buffer" ); -continue ; - } -tst_resm (TPASS ,"functionality of read() is correct" ); - -SAFE_CLOSE (cleanup, rfild); +if (TST_RET !=TST_SIZE ) { +tst_res (TFAIL ,"Bad read count - got %ld - expected %d" , +TST_RET ,TST_SIZE ); + goto out; + } +if (memcmp (palfa, prbuf,TST_SIZE )) { +tst_res (TFAIL ,"read buffer not equal to write buffer" ); + goto out; } +tst_res (TPASS ,"functionality of read() is correct" ); -cleanup (); -tst_exit (); +out: +SAFE_CLOSE (fd); } -/* -* setup() - performs all ONE TIME setup for this test -*/ -void setup (void ) +static void setup (void ) { - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +int fd;umask (0 ); - -TEST_PAUSE ; - -tst_tmpdir (); -sprintf (fname,"tfile_%d" ,getpid ()); -if ((fild =creat (fname,0777 )) ==-1 ) { -tst_brkm (TBROK , cleanup,"creat(%s, 0777) Failed, errno = %d" -" : %s" , fname, errno,strerror (errno)); - } -if (write (fild, palfa,TST_SIZE ) !=TST_SIZE ) { -tst_brkm (TBROK , cleanup,"can't write to Xread" ); - } -close (fild); + fd =SAFE_CREAT (fname,0777 ); +SAFE_WRITE (1 , fd, palfa,TST_SIZE ); +SAFE_CLOSE (fd); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at completion or -* premature exit. -*/ -void cleanup (void ) -{ - -unlink (fname); -tst_rmdir (); - -} +static struct tst_test test = { + .needs_tmpdir =1 , + .setup = setup, + .test_all = verify_read, +};
Signature · 1 line
2.31.1
PATCH 2/2 syscalls/read04: Convert to new API
Hi!
Pushed with minor changes, thanks.
The main change was that I renamed the TST_SIZE to PALFA_LEN since anything with tst_ or TST_ prefix is reserved for the test library, test must not define ideintifiers with these prefixes.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/2 syscalls/read03: Convert to new API
In reply to Shiyang RuanHi!
Pushed, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]