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 5074DCD37B0 for ; Mon, 18 Sep 2023 13:38:37 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 628363CE4EF for ; Mon, 18 Sep 2023 15:38:35 +0200 (CEST) Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) (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 05AC23C99CF for ; Mon, 18 Sep 2023 15:38:23 +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-6.smtp.seeweb.it (Postfix) with ESMTPS id 571D4142CDE4 for ; Mon, 18 Sep 2023 15:38: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-out1.suse.de (Postfix) with ESMTPS id B1DEB21C9D; Mon, 18 Sep 2023 13:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1695044301; 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; bh=AmonkNwov/iaUo/NZB04fbNzEvECFs0iwCbcDeEkjFk=; b=VhnjM2ZepFmPl6O9JMoaAi5B7ewUpBruKBH/B+MM8iH7fbTqyVPbdqp3qEJCI+P0QrljTt Af7IgInXtN+EOHOFoZorINgkXHkyXUj0ukKtsE95JgNovNT8G0rd4Jl3o9lV6BXoOr3PFE PMPo7jC/kzb4nF27RTtnoUG30kMx2jU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1695044301; 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; bh=AmonkNwov/iaUo/NZB04fbNzEvECFs0iwCbcDeEkjFk=; b=fh05mul1aAThe8i+ujV63RPskVZzLV03W8yaTsFOVrkXWE5x+QbU/N4c6uHrAJ87U1bHQ6 brnSuNlQw3UcGABw== 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 9C66513480; Mon, 18 Sep 2023 13:38:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Oxr4JM1SCGU8HQAAMHmgww (envelope-from ); Mon, 18 Sep 2023 13:38:21 +0000 From: Marius Kittler To: ltp@lists.linux.it Date: Mon, 18 Sep 2023 15:38:19 +0200 Message-ID: <20230918133819.16387-1-mkittler@suse.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 1.0.1 at in-6.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v2] Port getxattr01.c to new test 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" * Utilize 'all_filesystems = 1'-mechanism to test on various file systems instead of relying on the temporary directory's file system to support xattr (which it probably does not as it is commonly a tmpfs) * Improve error handling * Simplify code and description * Related issue: https://github.com/linux-test-project/ltp/issues/583 Signed-off-by: Marius Kittler --- .../kernel/syscalls/getxattr/getxattr01.c | 214 +++++++----------- 1 file changed, 81 insertions(+), 133 deletions(-) diff --git a/testcases/kernel/syscalls/getxattr/getxattr01.c b/testcases/kernel/syscalls/getxattr/getxattr01.c index cec802a33..105b15343 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr01.c +++ b/testcases/kernel/syscalls/getxattr/getxattr01.c @@ -1,184 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2011 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Further, this software is distributed without any warranty that it - * is free of the rightful claim of any third person regarding - * infringement or the like. Any license provided herein, whether - * implied or otherwise, applies only to this software file. Patent - * licenses, if any, provided herein do not apply to combinations of - * this program with other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Copyright (C) 2011 Red Hat, Inc. + * Copyright (c) 2023 Marius Kittler */ -/* - * Basic tests for getxattr(2) and make sure getxattr(2) handles error - * conditions correctly. +/*\ + * [Description] * - * There are 4 test cases: + * Basic tests for getxattr(2), there are 3 test cases: * 1. Get an non-existing attribute, - * getxattr(2) should return -1 and set errno to ENODATA + * getxattr(2) should return -1 and set errno to ENODATA. * 2. Buffer size is smaller than attribute value size, - * getxattr(2) should return -1 and set errno to ERANGE - * 3. Get attribute, getxattr(2) should succeed - * 4. Verify the attribute got by getxattr(2) is same as the value we set + * getxattr(2) should return -1 and set errno to ERANGE. + * 3. getxattr(2) should succeed and return the same value we set + * before. */ #include "config.h" #include #include -#include -#include -#include #include #include -#include -#ifdef HAVE_SYS_XATTR_H -# include -#endif -#include "test.h" -#include "safe_macros.h" -char *TCID = "getxattr01"; +#include "tst_test.h" #ifdef HAVE_SYS_XATTR_H +#include + +#include "tst_test_macros.h" + +#define MNTPOINT "mntpoint" #define XATTR_TEST_KEY "user.testkey" #define XATTR_TEST_VALUE "this is a test value" #define XATTR_TEST_VALUE_SIZE 20 #define BUFFSIZE 64 -static void setup(void); -static void cleanup(void); +static char filename[BUFSIZ]; +static char *workdir; -char filename[BUFSIZ]; - -struct test_case { +static struct test_case { char *fname; char *key; - char *value; + char value[BUFFSIZE]; size_t size; int exp_err; -}; -struct test_case tc[] = { - { /* case 00, get non-existing attribute */ +} tcases[] = { + { /* case 00, get non-existing attribute */ .fname = filename, .key = "user.nosuchkey", - .value = NULL, + .value = {0}, .size = BUFFSIZE - 1, .exp_err = ENODATA, - }, - { /* case 01, small value buffer */ + }, + { /* case 01, small value buffer */ .fname = filename, .key = XATTR_TEST_KEY, - .value = NULL, + .value = {0}, .size = 1, .exp_err = ERANGE, - }, - { /* case 02, get existing attribute */ + }, + { /* case 02, get existing attribute */ .fname = filename, .key = XATTR_TEST_KEY, - .value = NULL, + .value = {0}, .size = BUFFSIZE - 1, .exp_err = 0, - }, + }, }; -int TST_TOTAL = sizeof(tc) / sizeof(tc[0]) + 1; - -int main(int argc, char *argv[]) +static void run(unsigned int i) { - int lc; - int i; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - - for (i = 0; i < (int)ARRAY_SIZE(tc); i++) { - TEST(getxattr(tc[i].fname, tc[i].key, tc[i].value, - tc[i].size)); - - if (TEST_ERRNO == tc[i].exp_err) { - tst_resm(TPASS | TTERRNO, "expected behavior"); - } else { - tst_resm(TFAIL | TTERRNO, "unexpected behavior" - "- expected errno %d - Got", - tc[i].exp_err); - } - } - - if (TEST_RETURN != XATTR_TEST_VALUE_SIZE) { - tst_resm(TFAIL, - "getxattr() returned wrong size %ld expected %d", - TEST_RETURN, XATTR_TEST_VALUE_SIZE); - continue; - } - - if (memcmp(tc[i - 1].value, XATTR_TEST_VALUE, XATTR_TEST_VALUE_SIZE)) - tst_resm(TFAIL, "Wrong value, expect \"%s\" got \"%s\"", - XATTR_TEST_VALUE, tc[i - 1].value); - else - tst_resm(TPASS, "Got the right value"); + struct test_case *tc = &tcases[i]; + + SAFE_CHDIR(workdir); + + /* create test file and set xattr */ + snprintf(tc->fname, BUFSIZ, "getxattr01testfile-%u", i); + SAFE_TOUCH(tc->fname, 0644, NULL); + SAFE_SETXATTR(tc->fname, XATTR_TEST_KEY, XATTR_TEST_VALUE, + strlen(XATTR_TEST_VALUE), XATTR_CREATE); + + /* read xattr back */ + TEST(getxattr(tc->fname, tc->key, tc->value, tc->size)); + if (TST_ERR == tc->exp_err) { + tst_res(TPASS | TTERRNO, "expected getxattr() return code"); + } else { + tst_res(TFAIL | TTERRNO, "unexpected getxattr() return code" + " - expected errno %d", tc->exp_err); } - cleanup(); - tst_exit(); + /* verify the value for non-error test cases */ + if (tc->exp_err) + return; + TST_EXP_EQ_LI(TST_RET, XATTR_TEST_VALUE_SIZE); + if (memcmp(tc->value, XATTR_TEST_VALUE, XATTR_TEST_VALUE_SIZE)) + tst_res(TFAIL, "wrong value, expected \"%s\" got \"%s\"", + XATTR_TEST_VALUE, tc->value); + else + tst_res(TPASS, "right value"); } static void setup(void) { - int fd; - unsigned int i; - - tst_require_root(); - - tst_tmpdir(); - - /* Create test file and setup initial xattr */ - snprintf(filename, BUFSIZ, "getxattr01testfile"); - fd = SAFE_CREAT(cleanup, filename, 0644); - close(fd); - if (setxattr(filename, XATTR_TEST_KEY, XATTR_TEST_VALUE, - strlen(XATTR_TEST_VALUE), XATTR_CREATE) == -1) { - if (errno == ENOTSUP) { - tst_brkm(TCONF, cleanup, "No xattr support in fs or " - "mount without user_xattr option"); - } - } + char *cwd = SAFE_GETCWD(NULL, 0); - /* Prepare test cases */ - for (i = 0; i < ARRAY_SIZE(tc); i++) { - tc[i].value = malloc(BUFFSIZE); - if (tc[i].value == NULL) { - tst_brkm(TBROK | TERRNO, cleanup, - "Cannot allocate memory"); - } - } - - TEST_PAUSE; + workdir = SAFE_MALLOC(strlen(cwd) + strlen(MNTPOINT) + 2); + sprintf(workdir, "%s/%s", cwd, MNTPOINT); + free(cwd); } -static void cleanup(void) -{ - tst_rmdir(); -} -#else /* HAVE_SYS_XATTR_H */ -int main(int argc, char *argv[]) -{ - tst_brkm(TCONF, NULL, " does not exist."); -} +static struct tst_test test = { + .all_filesystems = 1, + .needs_root = 1, + .mntpoint = MNTPOINT, + .mount_device = 1, + .skip_filesystems = (const char *const []) { + "exfat", + "tmpfs", + "ramfs", + "nfs", + "vfat", + NULL + }, + .setup = setup, + .test = run, + .tcnt = ARRAY_SIZE(tcases) +}; + +#else +TST_TEST_TCONF("System doesn't have "); #endif -- 2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp