Re: [LTP] [PATCH v2 1/9] Rewrite rename01.c using new LTP API

[Avinesh Kumar <akumar@suse.de>]

On Monday, July 11, 2022 11:00:20 AM IST Richard Palethorpe wrote:
> Hello,
> 
> Avinesh Kumar <akumar@suse.de> writes:
> 
> > Signed-off-by: Avinesh Kumar <akumar@suse.de>
> > ---
> >  testcases/kernel/syscalls/rename/rename01.c | 259 +++++---------------
> >  1 file changed, 58 insertions(+), 201 deletions(-)
> >
> > diff --git a/testcases/kernel/syscalls/rename/rename01.c b/testcases/kernel/syscalls/rename/rename01.c
> > index e7de18ff4..695d85c57 100644
> > --- a/testcases/kernel/syscalls/rename/rename01.c
> > +++ b/testcases/kernel/syscalls/rename/rename01.c
> > @@ -1,218 +1,75 @@
> > +// 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
> > + *  07/2001 Ported by Wayne Boyer
> > + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
> >   */
> >  
> > -/*
> > - * NAME
> > - *	rename01
> > - *
> > - * DESCRIPTION
> > - *	This test will verify the rename(2) syscall basic functionality.
> > - *	Verify rename() works when the "new" file or directory does not exist.
> > +/*\
> > + * [Description]
> >   *
> > - * ALGORITHM
> > - *	Setup:
> > - *		Setup signal handling.
> > - *		Create temporary directory.
> > - *		Pause for SIGUSR1 if option specified.
> > - *
> > - *	Test:
> > - *		Loop if the proper options are given.
> > - *              1.  "old" is plain file, new does not exists
> > - *                  create the "old" file, make sure the "new" file
> > - *                  dose not exist
> > - *                  rename the "old" to the "new" file
> > - *                  verify the "new" file points to the "old" file
> > - *                  verify the "old" file does not exist
> > - *
> > - *              2.  "old" is a directory,"new" does not exists
> > - *                  create the "old" directory, make sure "new"
> > - *                  dose not exist
> > - *                  rename the "old" to the "new"
> > - *                  verify the "new" points to the "old"
> > - *                  verify the "old" does not exist
> > - *	Cleanup:
> > - *		Print errno log and/or timing stats if options given
> > - *		Delete the temporary directory created.
> > - *
> > - * USAGE
> > - *	rename01 [-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
> > - *
> > - * RESTRICTIONS
> > - *	None.
> > + * Verify rename() when the newpath file or directory does not exist.
> >   */
> > -#include <sys/types.h>
> > -#include <fcntl.h>
> > -#include <sys/stat.h>
> > -#include <unistd.h>
> > -#include <errno.h>
> >  
> > -#include "test.h"
> > -#include "safe_macros.h"
> > -
> > -void setup();
> > -void cleanup();
> > +#include <sys/stat.h>
> > +#include <stdio.h>
> > +#include "tst_test.h"
> >  
> > -char *TCID = "rename01";
> > -int TST_TOTAL = 2;
> > +#define SWAP(a, b) do { \
> > +		const char *tmp__ = a; \
> > +		a = b; \
> > +		b = tmp__; \
> > +} while (0)
> 
> This doesn't need to be a macro (which don't have type or name collision
> checking and confuse some tooling etc.). It's actually the same number of
> lines to write it inline as well, i.e.
> 
> char *tmp;
> 
> tmp = a;
> a = b;
> b = tmp;
> 
> tmp = c;
> c = d;
> d = tmp;
> 
> However if you don't want to write it inline I'd prefer a function which
> takes const *const *char.
> 

Thanks Richie! I have changed it to inline in updated patch.

> Otherwise looks good.
> 
> 

--
Avinesh




-- 
Mailing list info: https://lists.linux.it/listinfo/ltp