pipe10.c: Rewrite the test using new LTP API
PATCH 1/1 pipe10.c: Rewrite the test using new LTP API
Signed-off-by Avinesh Kumar <[email protected]>
--- testcases/kernel/syscalls/pipe/pipe10.c | 179 +++++------------------- 1 file changed, 34 insertions(+), 145 deletions(-)
testcases/kernel/syscalls/pipe/pipe10.c +34 -145
@@ -1,164 +1,53 @@ +// 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 +* 07/2001 Ported by Wayne Boyer +* Copyright (c) 2023 SUSE LLC Avinesh Kumar <[email protected]> */ -/* -* NAME -* pipe10.c -* -* DESCRIPTION -* Check that parent can open a pipe and have a child read from it -* -* ALGORITHM -* Parent opens pipe, child reads. Passes if child can read all the -* characters written by the parent. -* -* USAGE: <for command-line> -* pipe10 [-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 +* Verify that, when a parent process opens a pipe, a child process can +* read from it. */ -#include <errno.h> -#include <unistd.h> -#include <sys/wait.h> -#include <string.h> -#include "test.h" -char *TCID ="pipe10" ; -int TST_TOTAL =1 ; +#include <stdio.h> +#include "tst_test.h" -void setup (void ); -void cleanup (void ); +static int fds[2 ]; -ssize_t do_read (int fd,void *buf,size_t count) +static void run (void ) { -ssize_t n; - -do { - n =read (fd, buf, count); - }while (n <0 && errno ==EINTR ); - -return n; -} - -int main (int ac,char **av) -{ -int lc; - -int fd[2 ];/* fds for pipe read/write */ -char wrbuf[BUFSIZ ], rebuf[BUFSIZ ]; -int red, written;/* no of chars read and */ -/* written to pipe */ -int length, greater, forkstat; -int retval =0 , status, e_code; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { +int pid; +int wr_cnt, rd_cnt; +char wrbuf[] ="abcdefghijklmnopqrstuvwxyz" ; +char rdbuf[BUFSIZ ]; -/* reset tst_count in case we are looping */ - tst_count =0 ; +SAFE_PIPE (fds); + wr_cnt =SAFE_WRITE (SAFE_WRITE_ALL , fds[1 ], wrbuf,sizeof (wrbuf)); -TEST (pipe (fd)); + pid =SAFE_FORK (); -if (TEST_RETURN ==-1 ) { - retval =1 ; -tst_resm (TFAIL ,"pipe creation failed" ); -continue ; - } - -strcpy (wrbuf,"abcdefghijklmnopqrstuvwxyz" ); - length =strlen (wrbuf) +1 ; - - written =write (fd[1 ], wrbuf, length); - -/* did write write at least some chars */ -if ((written <0 ) || (written > length)) { -tst_brkm (TBROK , cleanup,"write to pipe failed" ); - } - - forkstat =FORK_OR_VFORK (); - -if (forkstat ==-1 ) { -tst_brkm (TBROK , cleanup,"fork() failed" ); - } - -if (forkstat ==0 ) {/* child */ - red =do_read (fd[0 ], rebuf, written); - -/* did read , get at least some chars */ -if ((red <0 ) || (red > written)) { -tst_brkm (TBROK , cleanup,"read pipe failed" ); - } - - greater =strcmp (rebuf, wrbuf); - -/* are the strings written and read equal */ -if (greater ==0 ) { -tst_resm (TPASS ,"functionality is correct" ); - }else { - retval =1 ; -tst_resm (TFAIL ,"read & write strings do " -"not match" ); - } -exit (retval); - }else {/* parent */ -/* wait for the child to finish */ -wait (&status); -/* make sure the child returned a good exit status */ - e_code = status >>8 ; -if (e_code !=0 ) { -tst_resm (TFAIL ,"Failures reported above" ); - } - } +if (pid ==0 ) { + rd_cnt =SAFE_READ (1 , fds[0 ], rdbuf, wr_cnt); +TST_EXP_EQ_LU (wr_cnt, rd_cnt); } -cleanup (); - -tst_exit (); +tst_reap_children (); +SAFE_CLOSE (fds[0 ]); +SAFE_CLOSE (fds[1 ]); } -/* -* setup() - performs all ONE TIME setup for this test. -*/ -void setup (void ) +static void cleanup (void ) { - -tst_sig (FORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; +if (fds[0 ] >0 ) +SAFE_CLOSE (fds[0 ]); +if (fds[1 ] >0 ) +SAFE_CLOSE (fds[1 ]); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) -{ -} +static struct tst_test test = { + .test_all = run, + .forks_child =1 , + .cleanup = cleanup +};
Signature · 5 lines
2.41.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Avinesh,
Quoted 1 line
testcases/kernel/syscalls/pipe/pipe10.c +1
-0+int pid;
...
Quoted 1 line
testcases/kernel/syscalls/pipe/pipe10.c +1
-0+ pid =SAFE_FORK ();
...
testcases/kernel/syscalls/pipe/pipe10.c line 32
Quoted 1 line
testcases/kernel/syscalls/pipe/pipe10.c +1
-0+if (pid ==0 ) {
Because pid is not needed for anything else, I just changed this to:
if (!SAFE_FORK()) {and merged.
Thank you!
Kind regards,
Petr
Quoted 2 lines
testcases/kernel/syscalls/pipe/pipe10.c +2
-0+ rd_cnt =SAFE_READ (1 , fds[0 ], rdbuf, wr_cnt); +TST_EXP_EQ_LU (wr_cnt, rd_cnt);
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp