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 9622BC43334 for ; Thu, 23 Jun 2022 08:02:45 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B6F3B3C01CC for ; Thu, 23 Jun 2022 10:02:43 +0200 (CEST) Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) (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 BAAD23C9515 for ; Thu, 23 Jun 2022 10:02:23 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (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 CFF546005D2 for ; Thu, 23 Jun 2022 10:02:22 +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-out2.suse.de (Postfix) with ESMTPS id 045E31FD48; Thu, 23 Jun 2022 08:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1655971342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oAFBT5lZOPZHvsl8l7SbGABCEVu+WY93YoHRrBfvhAc=; b=SQeZ3YNPeYX5kbXjmNsTB+C4n4gkkYnXVHnsEBYM49NT04VG3jAY1NmGpGZLZ8f6cUSwLJ oT9Q0ajd/YzP15BDGZ1bE3w5auvn94U7YMr5f2fhVwIVySb2JUG9Tl008BigP6g3uC7Z/i hMT9cynIGAyhJfTWoiZJ1+CDHro4UdY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1655971342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oAFBT5lZOPZHvsl8l7SbGABCEVu+WY93YoHRrBfvhAc=; b=elvhLc0D1W3/VzBZBYfTuh73NzkWDM9eM7uRE8tgi0Z71NtyAuZU8+PS0xwZu/9lM/ZL6S d3BATF8cRA3B2JCQ== 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 99517133A6; Thu, 23 Jun 2022 08:02:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id zPu2Gg0etGJcdgAAMHmgww (envelope-from ); Thu, 23 Jun 2022 08:02:21 +0000 From: Avinesh Kumar To: ltp@lists.linux.it Date: Thu, 23 Jun 2022 13:32:10 +0530 Message-Id: <20220623080215.24186-2-akumar@suse.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623080215.24186-1-akumar@suse.de> References: <20220623080215.24186-1-akumar@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: [LTP] [PATCH v2 1/6] Rewrite utime01.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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Signed-off-by: Avinesh Kumar --- testcases/kernel/syscalls/utime/utime01.c | 263 +++++----------------- 1 file changed, 58 insertions(+), 205 deletions(-) diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c index 1e6862515..2ce906751 100644 --- a/testcases/kernel/syscalls/utime/utime01.c +++ b/testcases/kernel/syscalls/utime/utime01.c @@ -1,223 +1,76 @@ +// 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 + * 07/2001 ported by John George + * Copyright (c) 2022 SUSE LLC Avinesh Kumar */ -/* - * Test Name: utime01 - * - * Test Description: - * Verify that the system call utime() successfully sets the modification - * and access times of a file to the current time, if the times argument - * is null, and the user ID of the process is "root". - * - * Expected Result: - * utime succeeds returning zero and sets the access and modification - * times of the file to the current time. - * - * Algorithm: - * Setup: - * Setup signal handling. - * Create temporary directory. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Loop if the proper options are given. - * Execute system call - * Check return code, if system call failed (return=-1) - * Log the errno and Issue a FAIL message. - * Otherwise, - * Verify the Functionality of system call - * if successful, - * Issue Functionality-Pass message. - * Otherwise, - * Issue Functionality-Fail message. - * Cleanup: - * Print errno log and/or timing stats if options given - * Delete the temporary directory created. - * - * Usage: - * utime01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t] - * where, -c n : Run n copies concurrently. - * -e : Turn on errno logging. - * -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 John George - * -Ported - * - * Restrictions: - * This test should be run by 'super-user' (root) only. +/*\ + * [Description] * + * Verify that the system call utime() successfully changes the last + * access and modification times of a file to the current time if the + * times argument is NULL and the user ID of the process is "root". */ -#include -#include -#include -#include -#include #include -#include -#include -#include -#include - -#include "test.h" -#include "safe_macros.h" - -#define TEMP_FILE "tmp_file" -#define FILE_MODE S_IRUSR | S_IRGRP | S_IROTH -char *TCID = "utime01"; -int TST_TOTAL = 1; -time_t curr_time; /* current time in seconds */ +#include "tst_test.h" +#include "tst_clocks.h" -void setup(); /* Main setup function of test */ -void cleanup(); /* cleanup function for the test */ +#define MNT_POINT "mntpoint" +#define TEMP_FILE MNT_POINT"/tmp_file" +#define FILE_MODE 0444 -int main(int ac, char **av) +static void setup(void) { - struct stat stat_buf; /* struct buffer to hold file info. */ - int lc; - long type; - time_t modf_time, access_time; - time_t pres_time; /* file modification/access/present time */ - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - switch ((type = tst_fs_type(cleanup, "."))) { - case TST_NFS_MAGIC: - if (tst_kvercmp(2, 6, 18) < 0) - tst_brkm(TCONF, cleanup, "Cannot do utime on a file" - " on %s filesystem before 2.6.18", - tst_fs_type_name(type)); - break; - case TST_V9FS_MAGIC: - tst_brkm(TCONF, cleanup, - "Cannot do utime on a file on %s filesystem", - tst_fs_type_name(type)); - break; - } - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - /* - * Invoke utime(2) to set TEMP_FILE access and - * modification times to the current time. - */ - TEST(utime(TEMP_FILE, NULL)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL|TTERRNO, "utime(%s) failed", TEMP_FILE); - } else { - /* - * Sleep for a second so that mod time and - * access times will be different from the - * current time - */ - sleep(2); - - /* - * Get the current time now, after calling - * utime(2) - */ - pres_time = time(NULL); - - /* - * Get the modification and access times of - * temporary file using stat(2). - */ - SAFE_STAT(cleanup, TEMP_FILE, &stat_buf); - modf_time = stat_buf.st_mtime; - access_time = stat_buf.st_atime; - - /* Now do the actual verification */ - if (modf_time <= curr_time || - modf_time >= pres_time || - access_time <= curr_time || - access_time >= pres_time) { - tst_resm(TFAIL, "%s access and " - "modification times not set", - TEMP_FILE); - } else { - tst_resm(TPASS, "Functionality of " - "utime(%s, NULL) successful", - TEMP_FILE); - } - } - tst_count++; - } - - cleanup(); - tst_exit(); + SAFE_TOUCH(TEMP_FILE, FILE_MODE, NULL); } -/* - * void - * setup() - performs all ONE TIME setup for this test. - * Create a temporary directory and change directory to it. - * Create a test file under temporary directory and close it - */ -void setup(void) +static void run(void) { - int fildes; /* file handle for temp file */ - - tst_require_root(); - - tst_sig(FORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - - /* Creat a temporary file under above directory */ - fildes = SAFE_CREAT(cleanup, TEMP_FILE, FILE_MODE); - - /* Close the temporary file created */ - SAFE_CLOSE(cleanup, fildes); - - /* Get the current time */ - curr_time = time(NULL); - - /* - * Sleep for a second so that mod time and access times will be - * different from the current time - */ - sleep(2); /* sleep(1) on IA64 sometimes sleeps < 1 sec!! */ + struct utimbuf utbuf; + struct stat stat_buf; + time_t pre_time, post_time; + + utbuf.modtime = tst_get_fs_timestamp() - 5; + utbuf.actime = utbuf.modtime + 1; + TST_EXP_PASS_SILENT(utime(TEMP_FILE, &utbuf)); + SAFE_STAT(TEMP_FILE, &stat_buf); + + TST_EXP_EQ_LI(stat_buf.st_atime, utbuf.actime); + TST_EXP_EQ_LI(stat_buf.st_mtime, utbuf.modtime); + + pre_time = tst_get_fs_timestamp(); + TST_EXP_PASS(utime(TEMP_FILE, NULL), "utime(%s, NULL)", TEMP_FILE); + if (!TST_PASS) + return; + post_time = tst_get_fs_timestamp(); + SAFE_STAT(TEMP_FILE, &stat_buf); + + if (stat_buf.st_mtime < pre_time || stat_buf.st_mtime > post_time) + tst_res(TFAIL, "utime() did not set expected mtime, " + "pre_time: %ld, post_time: %ld, st_mtime: %ld", + pre_time, post_time, stat_buf.st_mtime); + + if (stat_buf.st_atime < pre_time || stat_buf.st_atime > post_time) + tst_res(TFAIL, "utime() did not set expected atime, " + "pre_time: %ld, post_time: %ld, st_atime: %ld", + pre_time, post_time, stat_buf.st_atime); } -/* - * void - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - * Remove the test directory and testfile created in the setup. - */ -void cleanup(void) -{ - - tst_rmdir(); - -} +static struct tst_test test = { + .test_all = run, + .setup = setup, + .needs_root = 1, + .needs_tmpdir = 1, + .mntpoint = MNT_POINT, + .mount_device = 1, + .all_filesystems = 1, + .skip_filesystems = (const char *const[]) { + "vfat", + "exfat", + NULL + } +}; -- 2.36.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp