From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 601BCC433EF for ; Wed, 13 Jul 2022 05:42:36 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 43AE73CA5E4 for ; Wed, 13 Jul 2022 07:42:34 +0200 (CEST) Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id DE3623CA316 for ; Wed, 13 Jul 2022 07:42:22 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 23490600A12 for ; Wed, 13 Jul 2022 07:42:21 +0200 (CEST) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 1DEB5339F6 for ; Wed, 13 Jul 2022 05:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1657690941; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xTblMZrPdgGvoBnuNs9os6vnWEidbfw1NMbkUpRlGss=; b=wOQogPyTzgQhMrS2Q1z0V9ziiFLqBW0vq8pzBiRcQf6rvliNzCCrgQK4E+UkamYEfQqweM Vco/HvuPJ5p1ZkRo9sSdozJuy4dnBO9PN2RU7G3GbSOQF+iJCiT6fRRsx3Ri3aj9bPx86M QWYI0LONYKTjXin99g4r6w2wBU84TSA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1657690941; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xTblMZrPdgGvoBnuNs9os6vnWEidbfw1NMbkUpRlGss=; b=DJW+SMzN2uvzbaKdaRgNjd49nZnNsa9aozKvSlky+AoqukqD/korIPznirSj10I3K+/ktr +xTQAbR9BJddUkCQ== Received: from g78 (unknown [10.163.24.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id C529D2C141; Wed, 13 Jul 2022 05:42:20 +0000 (UTC) References: <20220712153417.14551-1-akumar@suse.de> <20220712153417.14551-6-akumar@suse.de> User-agent: mu4e 1.6.10; emacs 28.1 From: Richard Palethorpe To: Avinesh Kumar Date: Wed, 13 Jul 2022 06:42:11 +0100 In-reply-to: <20220712153417.14551-6-akumar@suse.de> Message-ID: <87h73lmuv7.fsf@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-5.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v3 5/9] Rewrite rename05.c using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: rpalethorpe@suse.de Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Reviewed-by: Richard Palethorpe Avinesh Kumar writes: > Rewrite using new LTP API and enable all filesystems > > Signed-off-by: Avinesh Kumar > --- > testcases/kernel/syscalls/rename/rename05.c | 193 +++----------------- > 1 file changed, 28 insertions(+), 165 deletions(-) > > diff --git a/testcases/kernel/syscalls/rename/rename05.c b/testcases/kernel/syscalls/rename/rename05.c > index db10720fe..7894a9214 100644 > --- a/testcases/kernel/syscalls/rename/rename05.c > +++ b/testcases/kernel/syscalls/rename/rename05.c > @@ -1,179 +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 > */ > > -/* > - * NAME > - * rename05 > - * > - * DESCRIPTION > - * This test will verify that rename(2) fails with EISDIR > - * > - * ALGORITHM > - * Setup: > - * Setup signal handling. > - * Create temporary directory. > - * Pause for SIGUSR1 if option specified. > - * create the "old" file and the "new" directory > - * rename the "old" file to the "new" directory > - * > - * Test: > - * Loop if the proper options are given. > - * verify rename() failed and returned EISDIR > - * > - * Cleanup: > - * Print errno log and/or timing stats if options given > - * Delete the temporary directory created. > - * > - * USAGE > - * rename05 [-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. > - * > - * HISTORY > - * 07/2001 Ported by Wayne Boyer > +/*\ > + * [Description] > * > - * RESTRICTIONS > - * None. > + * Verify that rename(2) fails with EISDIR when > + * oldpath is not a directory and newpath is an existing directory. > */ > -#include > -#include > -#include > -#include > -#include > > -#include "test.h" > -#include "safe_macros.h" > +#include > +#include "tst_test.h" > > -void setup(); > -void cleanup(); > +#define MNT_POINT "mntpoint" > +#define TEMP_FILE "tmpfile" > +#define TEMP_DIR "tmpdir" > > -char *TCID = "rename05"; > -int TST_TOTAL = 1; > - > -int fd; > -char fname[255], mdir[255]; > -struct stat buf1, buf2; > -dev_t olddev, olddev1; > -ino_t oldino, oldino1; > - > -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; > - > - /* attempt to rename a file to a directory */ > - /* Call rename(2) */ > - TEST(rename(fname, mdir)); > - > - if (TEST_RETURN != -1) { > - tst_resm(TFAIL, "rename(%s, %s) succeed unexpected", > - fname, mdir); > - continue; > - } > - > - if (errno != EISDIR) { > - tst_resm(TFAIL, "Expected EISDIR got %d", TEST_ERRNO); > - } else { > - tst_resm(TPASS, "rename() returned EISDIR"); > - } > - } > - > - /* > - * cleanup and exit > - */ > - cleanup(); > - tst_exit(); > - > + SAFE_CHDIR(MNT_POINT); > + SAFE_TOUCH(TEMP_FILE, 0700, NULL); > + SAFE_MKDIR(TEMP_DIR, 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(mdir, "./rndir_%d", getpid()); > - sprintf(fname, "./tfile_%d", getpid()); > - > - /* create "old" file */ > - SAFE_TOUCH(cleanup, fname, 0700, NULL); > - SAFE_STAT(cleanup, fname, &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(TEMP_FILE, TEMP_DIR), > + EISDIR); > } > > -/* > - * cleanup() - performs all ONE TIME cleanup for this test at > - * completion or premature exit. > - */ > -void cleanup(void) > -{ > - > - /* > - * Remove the temporary directory. > - */ > - tst_rmdir(); > - > - /* > - * Exit with return code appropriate for results. > - */ > - > -} > +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 -- Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp