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 D4B5BCCA47C for ; Tue, 12 Jul 2022 15:44:02 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 9A5363CA7F3 for ; Tue, 12 Jul 2022 17:44:00 +0200 (CEST) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id E23433CA728 for ; Tue, 12 Jul 2022 17:43:48 +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-7.smtp.seeweb.it (Postfix) with ESMTPS id 2537A200099 for ; Tue, 12 Jul 2022 17:43:47 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 51C0E33713; Tue, 12 Jul 2022 15:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1657640627; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X45521xXyswrHruWs7ful8kGCeGamvRX3+teUg1gdrE=; b=ZIRexuWKheKBPSRDJKiX1DgVpw15BDG3Tdz2Dy7yjstfgprrLwfYOTvvZScpm10CY0HucU k0JfRTgGk0Y0c/7mymMLsgSjexJrDGSe3eY4ScT4nFnJ9nHzUNTeBjjvd8WVPXRKbojxj0 dbj21NQueqa+B/Yx8TDCYG/pSXi4SyY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1657640627; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X45521xXyswrHruWs7ful8kGCeGamvRX3+teUg1gdrE=; b=fhDLy5xHSFlGCGwrEFEGKGTx+A3IlwCutrbG8eKKR28GBvIQZu7hVa8PrqGwYANfWW1Mzi rF3hP8JVA5MCBWBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 428E913A94; Tue, 12 Jul 2022 15:43:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id vjX5ALKWzWLjfwAAMHmgww (envelope-from ); Tue, 12 Jul 2022 15:43:46 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Tue, 12 Jul 2022 21:13:43 +0530 Message-ID: <3360279.vcJHHDm8YO@localhost> Organization: SUSE In-Reply-To: <875yk4p3gx.fsf@suse.de> References: <20220707110319.24665-1-akumar@suse.de> <20220707110319.24665-5-akumar@suse.de> <875yk4p3gx.fsf@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v2 4/9] Rewrite rename04.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: , 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" On Monday, July 11, 2022 11:47:23 AM IST Richard Palethorpe wrote: > Hello, > > Avinesh Kumar writes: > > > Signed-off-by: Avinesh Kumar > > --- > > testcases/kernel/syscalls/rename/rename04.c | 201 ++++---------------- > > 1 file changed, 33 insertions(+), 168 deletions(-) > > > > diff --git a/testcases/kernel/syscalls/rename/rename04.c b/testcases/kernel/syscalls/rename/rename04.c > > index 32594a776..13cdf98ad 100644 > > --- a/testcases/kernel/syscalls/rename/rename04.c > > +++ b/testcases/kernel/syscalls/rename/rename04.c > > @@ -1,182 +1,47 @@ > > +// 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 > > - * rename04 > > - * > > - * DESCRIPTION > > - * This test will verify that rename(2) failed when newpath is > > - * a non-empty directory and return EEXIST or ENOTEMPTY > > - * > > - * ALGORITHM > > - * Setup: > > - * Setup signal handling. > > - * Create temporary directory. > > - * Pause for SIGUSR1 if option specified. > > - * create the "old" directory and the "new" directory > > - * create a file uner the "new" directory > > - * > > - * Test: > > - * Loop if the proper options are given. > > - * rename the "old" to the "new" directory > > - * verify rename() failed and returned ENOTEMPTY > > - * > > - * Cleanup: > > - * Print errno log and/or timing stats if options given > > - * Delete the temporary directory created. > > - * > > - * USAGE > > - * rename04 [-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() fails with EEXIST or ENOTEMPTY when > > + * newpath is a non-empty directory. > > */ > > -#include > > -#include > > -#include > > -#include > > -#include > > > > -#include "test.h" > > -#include "safe_macros.h" > > +#include > > +#include "tst_test.h" > > > > -void setup(); > > -void cleanup(); > > +#define DIR1 "dir1" > > +#define DIR2 "dir2" > > +#define TEMP_FILE DIR2"/tmpfile" > > > > -char *TCID = "rename04"; > > -int TST_TOTAL = 1; > > - > > -int fd; > > -char tstfile[40]; > > -char fdir[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; > > - > > - /* rename a directory to a non-empty directory */ > > - > > - /* Call rename(2) */ > > - TEST(rename(fdir, mdir)); > > - > > - if (TEST_RETURN != -1) { > > - tst_resm(TFAIL, "rename(%s, %s) succeeded unexpectedly", > > - fdir, mdir); > > - continue; > > - } > > - > > - if (TEST_ERRNO == ENOTEMPTY) { > > - tst_resm(TPASS, "rename() returned ENOTEMPTY"); > > - } else if (TEST_ERRNO == EEXIST) { > > - tst_resm(TPASS, "rename() returned EEXIST"); > > - } else { > > - tst_resm(TFAIL, "Expected ENOTEMPTY or EEXIST got %d", > > - TEST_ERRNO); > > - } > > - > > - } > > - > > - /* > > - * cleanup and exit > > - */ > > - cleanup(); > > - tst_exit(); > > - > > + SAFE_MKDIR(DIR1, 00770); > > + SAFE_MKDIR(DIR2, 00770); > > + SAFE_TOUCH(TEMP_FILE, 0700, NULL); > > } > > > > -/* > > - * 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, "./rndir_%d", getpid()); > > - sprintf(tstfile, "%s/tstfile_%d", mdir, getpid()); > > - > > - /* create "old" directory */ > > - 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 */ > > - SAFE_MKDIR(cleanup, mdir, 00770); > > - > > - SAFE_TOUCH(cleanup, tstfile, 0700, NULL); > > - > > - SAFE_STAT(cleanup, mdir, &buf2); > > - > > - /* save "new"'s dev and ino */ > > - olddev1 = buf2.st_dev; > > - oldino1 = buf2.st_ino; > > + TEST(rename(DIR1, DIR2)); > > + > > + if (TST_RET == -1 && TST_ERR == ENOTEMPTY) > > + tst_res(TPASS, "rename() failed with ENOTEMPTY"); > > + else if (TST_RET == -1 && TST_ERR == EEXIST) > > + tst_res(TPASS, "rename() failed with EEXIST"); > > + else if (TST_RET == 0) > > + tst_res(TFAIL, "rename() succeeded unexpectedly"); > > + else > > + tst_res(TFAIL, "rename() failed, but not with expected > > errno"); > > You can print the errno name with tst_res(TFAIL | TERRNO, ...) Updated in the v3 patch. > > > } > > > > -/* > > - * 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_tmpdir = 1 > > I suppose all these tests should be done on all file systems as > well. Renaming is implemented differently on each filesystem. Good point! I have enabled these tests on all filesystems in v3 > > > +}; > > > -- Avinesh -- Mailing list info: https://lists.linux.it/listinfo/ltp