Message ID | 20220712153417.14551-7-akumar@suse.de |
---|---|
State | Accepted |
Headers | show |
Series | Simplify and convert some of rename tests to new LTP API | expand |
Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com> Avinesh Kumar <akumar@suse.de> writes: > Rewrite using new LTP API and enable all filesystems > > Signed-off-by: Avinesh Kumar <akumar@suse.de> > --- > testcases/kernel/syscalls/rename/rename06.c | 187 +++----------------- > 1 file changed, 28 insertions(+), 159 deletions(-) > > diff --git a/testcases/kernel/syscalls/rename/rename06.c b/testcases/kernel/syscalls/rename/rename06.c > index e415b4158..82665d1c2 100644 > --- a/testcases/kernel/syscalls/rename/rename06.c > +++ b/testcases/kernel/syscalls/rename/rename06.c > @@ -1,173 +1,42 @@ > +// 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 > - * rename06 > - * > - * DESCRIPTION > - * This test will verify that rename(2) failed in EINVAL > - * > - * ALGORITHM > - * Setup: > - * Setup signal handling. > - * Create temporary directory. > - * Pause for SIGUSR1 if option specified. > - * create the "old" directory > - * create the "new" directory under the "old" directory > - * > - * Test: > - * Loop if the proper options are given. > - * rename the "old" to the "new" directory > - * verify rename() failed and returned EINVAL > - * > - * Cleanup: > - * Print errno log and/or timing stats if options given > - * Delete the temporary directory created. > - * > - * USAGE > - * rename06 [-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. > + * Verify that rename(2) fails with EINVAL when > + * an attempt is made to make a directory a subdirectory of itself. > */ > -#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(); > > -char *TCID = "rename06"; > -int TST_TOTAL = 1; > +#include <stdio.h> > +#include "tst_test.h" > > -int fd; > -char fdir[255], mdir[255]; > -struct stat buf1, buf2; > -dev_t olddev, olddev1; > -ino_t oldino, oldino1; > +#define MNT_POINT "mntpoint" > +#define DIR1 "dir1" > +#define DIR2 DIR1"/dir2" > > -int main(int ac, char **av) > +static void setup(void) > { > - int lc; > - > - /* > - * parse standard options > - */ > - tst_parse_opts(ac, av, NULL, NULL); > - > - /* > - * perform global setup for test > - */ > - setup(); > - > - /* > - * check looping state if -i option given > - */ > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - > - tst_count = 0; > - > - /* rename a directory to a subdirectory of itself */ > - /* Call rename(2) */ > - TEST(rename(fdir, mdir)); > - > - if (TEST_RETURN != -1) { > - tst_resm(TFAIL, "rename(%s, %s) succeed unexpected", > - fdir, mdir); > - continue; > - } > - > - if (errno != EINVAL) { > - tst_resm(TFAIL, "Expected EINVAL got %d", TEST_ERRNO); > - } else { > - tst_resm(TPASS, "rename() returned EINVAL"); > - } > - } > - > - cleanup(); > - tst_exit(); > - > + SAFE_CHDIR(MNT_POINT); > + SAFE_MKDIR(DIR1, 00770); > + SAFE_MKDIR(DIR2, 00770); > } > > -/* > - * setup() - performs all ONE TIME setup for this test. > - */ > -void setup(void) > +static void run(void) > { > - > - tst_sig(NOFORK, DEF_HANDLER, cleanup); > - > - TEST_PAUSE; > - > - /* Create a temporary directory and make it current. */ > - tst_tmpdir(); > - > - sprintf(fdir, "./tdir_%d", getpid()); > - sprintf(mdir, "%s/rndir_%d", fdir, getpid()); > - > - /* create "old" directory */ > - if (stat(fdir, &buf1) != -1) { > - tst_brkm(TBROK, cleanup, "tmp directory %s found!", fdir); > - } > - SAFE_MKDIR(cleanup, fdir, 00770); > - SAFE_STAT(cleanup, fdir, &buf1); > - /* save "old"'s dev and ino */ > - olddev = buf1.st_dev; > - oldino = buf1.st_ino; > - > - /* create another directory */ > - if (stat(mdir, &buf2) != -1) { > - tst_brkm(TBROK, cleanup, "tmp directory %s found!", mdir); > - } > - SAFE_MKDIR(cleanup, mdir, 00770); > - > - SAFE_STAT(cleanup, mdir, &buf2); > - > - /* save "new"'s dev and ino */ > - olddev1 = buf2.st_dev; > - oldino1 = buf2.st_ino; > + TST_EXP_FAIL(rename(DIR1, DIR2), > + EINVAL); > } > > -/* > - * cleanup() - performs all ONE TIME cleanup for this test at > - * completion or premature exit. > - */ > -void cleanup(void) > -{ > - > - /* > - * Remove the temporary directory. > - */ > - tst_rmdir(); > -} > +static struct tst_test test = { > + .setup = setup, > + .test_all = run, > + .needs_root = 1, > + .mount_device = 1, > + .mntpoint = MNT_POINT, > + .all_filesystems = 1 > +}; > -- > 2.36.1
diff --git a/testcases/kernel/syscalls/rename/rename06.c b/testcases/kernel/syscalls/rename/rename06.c index e415b4158..82665d1c2 100644 --- a/testcases/kernel/syscalls/rename/rename06.c +++ b/testcases/kernel/syscalls/rename/rename06.c @@ -1,173 +1,42 @@ +// 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 - * rename06 - * - * DESCRIPTION - * This test will verify that rename(2) failed in EINVAL - * - * ALGORITHM - * Setup: - * Setup signal handling. - * Create temporary directory. - * Pause for SIGUSR1 if option specified. - * create the "old" directory - * create the "new" directory under the "old" directory - * - * Test: - * Loop if the proper options are given. - * rename the "old" to the "new" directory - * verify rename() failed and returned EINVAL - * - * Cleanup: - * Print errno log and/or timing stats if options given - * Delete the temporary directory created. - * - * USAGE - * rename06 [-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. + * Verify that rename(2) fails with EINVAL when + * an attempt is made to make a directory a subdirectory of itself. */ -#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(); -char *TCID = "rename06"; -int TST_TOTAL = 1; +#include <stdio.h> +#include "tst_test.h" -int fd; -char fdir[255], mdir[255]; -struct stat buf1, buf2; -dev_t olddev, olddev1; -ino_t oldino, oldino1; +#define MNT_POINT "mntpoint" +#define DIR1 "dir1" +#define DIR2 DIR1"/dir2" -int main(int ac, char **av) +static void setup(void) { - int lc; - - /* - * parse standard options - */ - tst_parse_opts(ac, av, NULL, NULL); - - /* - * perform global setup for test - */ - setup(); - - /* - * check looping state if -i option given - */ - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* rename a directory to a subdirectory of itself */ - /* Call rename(2) */ - TEST(rename(fdir, mdir)); - - if (TEST_RETURN != -1) { - tst_resm(TFAIL, "rename(%s, %s) succeed unexpected", - fdir, mdir); - continue; - } - - if (errno != EINVAL) { - tst_resm(TFAIL, "Expected EINVAL got %d", TEST_ERRNO); - } else { - tst_resm(TPASS, "rename() returned EINVAL"); - } - } - - cleanup(); - tst_exit(); - + SAFE_CHDIR(MNT_POINT); + SAFE_MKDIR(DIR1, 00770); + SAFE_MKDIR(DIR2, 00770); } -/* - * setup() - performs all ONE TIME setup for this test. - */ -void setup(void) +static void run(void) { - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - /* Create a temporary directory and make it current. */ - tst_tmpdir(); - - sprintf(fdir, "./tdir_%d", getpid()); - sprintf(mdir, "%s/rndir_%d", fdir, getpid()); - - /* create "old" directory */ - if (stat(fdir, &buf1) != -1) { - tst_brkm(TBROK, cleanup, "tmp directory %s found!", fdir); - } - SAFE_MKDIR(cleanup, fdir, 00770); - SAFE_STAT(cleanup, fdir, &buf1); - /* save "old"'s dev and ino */ - olddev = buf1.st_dev; - oldino = buf1.st_ino; - - /* create another directory */ - if (stat(mdir, &buf2) != -1) { - tst_brkm(TBROK, cleanup, "tmp directory %s found!", mdir); - } - SAFE_MKDIR(cleanup, mdir, 00770); - - SAFE_STAT(cleanup, mdir, &buf2); - - /* save "new"'s dev and ino */ - olddev1 = buf2.st_dev; - oldino1 = buf2.st_ino; + TST_EXP_FAIL(rename(DIR1, DIR2), + EINVAL); } -/* - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - */ -void cleanup(void) -{ - - /* - * Remove the temporary directory. - */ - tst_rmdir(); -} +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .mount_device = 1, + .mntpoint = MNT_POINT, + .all_filesystems = 1 +};
Rewrite using new LTP API and enable all filesystems Signed-off-by: Avinesh Kumar <akumar@suse.de> --- testcases/kernel/syscalls/rename/rename06.c | 187 +++----------------- 1 file changed, 28 insertions(+), 159 deletions(-)