From patchwork Tue Jul 12 15:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avinesh Kumar X-Patchwork-Id: 1655483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ED4MP8s9; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=xvKIm6I5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lj4ZJ5r2pz9sB4 for ; Wed, 13 Jul 2022 01:35:04 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3F8363CA539 for ; Tue, 12 Jul 2022 17:35:02 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.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 972D93CA508 for ; Tue, 12 Jul 2022 17:34:32 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (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 C8419200AC5 for ; Tue, 12 Jul 2022 17:34:31 +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 1593F22A75 for ; Tue, 12 Jul 2022 15:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1657640071; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lDVtkuEA2oAAkTmka31FAr7cdnFMP5560vdeJQMcnRo=; b=ED4MP8s9fuJWjj5KckKI+/hr4wlkzLHFl7EUKolUUN0uDCjTe7H37kLSMN98Rq9jKTHOj/ mqh7e26SZIcPNQy5lpgGteB3N/uv9/Ub4H/J3ZUe0djEiho9aj01i98I46zgLNLaCWnThG HCeOG/wJIZf+dxvRS1Ca8SaclIKtHwg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1657640071; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lDVtkuEA2oAAkTmka31FAr7cdnFMP5560vdeJQMcnRo=; b=xvKIm6I5/ZG7BJ10ZqinWdEbJEl9LRplzHb2v8iYeaPLpa0In+pSk9oCGZceDMzr/7EcjR +RGFwjCgbNKPEXDg== 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 8643F13A94 for ; Tue, 12 Jul 2022 15:34:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MWKLEYaUzWIzfAAAMHmgww (envelope-from ) for ; Tue, 12 Jul 2022 15:34:30 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Tue, 12 Jul 2022 21:04:11 +0530 Message-Id: <20220712153417.14551-4-akumar@suse.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712153417.14551-1-akumar@suse.de> References: <20220712153417.14551-1-akumar@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v3 3/9] Rewrite rename03.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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Rewrite using new LTP API and enable all filesystems Signed-off-by: Avinesh Kumar Reviewed-by: Richard Palethorpe --- testcases/kernel/syscalls/rename/rename03.c | 279 +++++--------------- 1 file changed, 61 insertions(+), 218 deletions(-) diff --git a/testcases/kernel/syscalls/rename/rename03.c b/testcases/kernel/syscalls/rename/rename03.c index 396e95c4d..652fa3bdb 100644 --- a/testcases/kernel/syscalls/rename/rename03.c +++ b/testcases/kernel/syscalls/rename/rename03.c @@ -1,230 +1,73 @@ +// 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 - * rename03 - * - * DESCRIPTION - * This test will verify that rename(2) functions correctly - * when the "new" file or directory exists - * - * ALGORITHM - * Setup: - * Setup signal handling. - * Create temporary directory. - * Pause for SIGUSR1 if option specified. +/*\ + * [Description] * - * Test: - * Loop if the proper options are given. - * 1. both old and new file exist - * create the "old" file and the "new" file - * rename the "old" to the "new" file - * verify the "new" file points to the "old" file - * verify the "old" file does not exists - * 2. both old file and new directory exist - * create the "old" and the "new" directory - * rename the "old" to the "new" directory - * verify the "new" points to the "old" directory - * verify the "old" does not exists - * Cleanup: - * Print errno log and/or timing stats if options given - * Delete the temporary directory created. - * - * USAGE - * rename03 [-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. - */ -#include -#include -#include -#include -#include - -#include "test.h" -#include "safe_macros.h" - -void setup(); -void setup2(); -void cleanup(); - -char *TCID = "rename03"; -int TST_TOTAL = 2; - -char fname[255], mname[255]; -char fdir[255], mdir[255]; -struct stat buf1, buf2; -dev_t f_olddev, d_olddev; -ino_t f_oldino, d_oldino; - -struct test_case_t { - char *name1; - char *name2; - char *desc; - dev_t *olddev; - ino_t *oldino; -} TC[] = { - { - fname, mname, "file", &f_olddev, &f_oldino}, { - fdir, mdir, "directory", &d_olddev, &d_oldino} -}; - -int main(int ac, char **av) -{ - int lc; - int i; - - /* - * 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; - - /* set up the files and directories for the tests */ - setup2(); - - /* loop through the test cases */ - for (i = 0; i < TST_TOTAL; i++) { - - TEST(rename(TC[i].name1, TC[i].name2)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, "call failed unexpectedly"); - continue; - } - - SAFE_STAT(cleanup, TC[i].name2, &buf2); - - /* - * verify the new file or directory is the - * same as the old one - */ - if (buf2.st_dev != *TC[i].olddev || - buf2.st_ino != *TC[i].oldino) { - tst_resm(TFAIL, "rename() failed: the " - "new %s points to a different " - "inode/location", TC[i].desc); - continue; - } - /* - * verify that the old file or directory - * does not exist - */ - if (stat(fname, &buf2) != -1) { - tst_resm(TFAIL, "the old %s still " - "exists", TC[i].desc); - continue; - } - - tst_resm(TPASS, "functionality is correct " - "for renaming a %s", TC[i].desc); - } - - /* reset things in case we are looping */ - - /* unlink the new file */ - SAFE_UNLINK(cleanup, mname); - - /* remove the new directory */ - SAFE_RMDIR(cleanup, mdir); - } - - cleanup(); - tst_exit(); - -} - -/* - * setup() - performs all ONE TIME setup for this test. + * Verify rename(2) functions correctly when the newpath + * file or directory (empty) exists. */ -void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; +#include +#include +#include "tst_test.h" - /* Create a temporary directory and make it current. */ - tst_tmpdir(); +#define MNT_POINT "mntpoint" +#define OLD_FILE_NAME MNT_POINT"/oldfile" +#define NEW_FILE_NAME MNT_POINT"/newfile" +#define OLD_DIR_NAME MNT_POINT"/olddir" +#define NEW_DIR_NAME MNT_POINT"/newdir" - sprintf(fname, "./tfile_%d", getpid()); - sprintf(mname, "./rnfile_%d", getpid()); - sprintf(fdir, "./tdir_%d", getpid()); - sprintf(mdir, "./rndir_%d", getpid()); -} +static struct stat old_file_st, old_dir_st, new_file_st, new_dir_st; -/* - * setup2() - set up the files and directories for the tests - */ -void setup2(void) +static void run(void) { - SAFE_TOUCH(cleanup, fname, 0700, NULL); - - SAFE_STAT(cleanup, fname, &buf1); - - /* save original file's dev and ino */ - f_olddev = buf1.st_dev; - f_oldino = buf1.st_ino; - - SAFE_TOUCH(cleanup, mname, 0700, NULL); - - /* create "old" directory */ - SAFE_MKDIR(cleanup, fdir, 00770); - SAFE_STAT(cleanup, fdir, &buf1); - - d_olddev = buf1.st_dev; - d_oldino = buf1.st_ino; - - /* create another directory */ - SAFE_MKDIR(cleanup, mdir, 00770); + SAFE_TOUCH(OLD_FILE_NAME, 0700, NULL); + SAFE_MKDIR(OLD_DIR_NAME, 00770); + SAFE_TOUCH(NEW_FILE_NAME, 0700, NULL); + SAFE_MKDIR(NEW_DIR_NAME, 00770); + + SAFE_STAT(OLD_FILE_NAME, &old_file_st); + SAFE_STAT(OLD_DIR_NAME, &old_dir_st); + + TST_EXP_PASS(rename(OLD_FILE_NAME, NEW_FILE_NAME), + "rename(%s, %s)", + OLD_FILE_NAME, NEW_FILE_NAME); + TST_EXP_PASS(rename(OLD_DIR_NAME, NEW_DIR_NAME), + "rename(%s, %s)", + OLD_DIR_NAME, NEW_DIR_NAME); + + SAFE_STAT(NEW_FILE_NAME, &new_file_st); + SAFE_STAT(NEW_DIR_NAME, &new_dir_st); + + TST_EXP_EQ_LU(old_file_st.st_dev, new_file_st.st_dev); + TST_EXP_EQ_LU(old_file_st.st_ino, new_file_st.st_ino); + + TST_EXP_EQ_LU(old_dir_st.st_dev, new_dir_st.st_dev); + TST_EXP_EQ_LU(old_dir_st.st_ino, new_dir_st.st_ino); + + TST_EXP_FAIL(stat(OLD_FILE_NAME, &old_file_st), + ENOENT, + "stat(%s, &old_file_st)", + OLD_FILE_NAME); + TST_EXP_FAIL(stat(OLD_DIR_NAME, &old_dir_st), + ENOENT, + "stat(%s, &old_dir_st)", + OLD_DIR_NAME); + + /* cleanup between loops */ + SAFE_UNLINK(NEW_FILE_NAME); + SAFE_RMDIR(NEW_DIR_NAME); } -/* - * 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 = { + .test_all = run, + .needs_root = 1, + .mount_device = 1, + .mntpoint = MNT_POINT, + .all_filesystems = 1 +};