From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xie Ziyao Date: Wed, 9 Jun 2021 17:49:24 +0800 Subject: [LTP] [PATCH 2/2] syscalls/chown: format output and delete duplicate header files In-Reply-To: <20210609094924.145262-1-xieziyao@huawei.com> References: <20210609094924.145262-1-xieziyao@huawei.com> Message-ID: <20210609094924.145262-3-xieziyao@huawei.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it 1. Print values not variable names in the TST_EXP_PASS(). 2. Delete duplicate header files. Signed-off-by: Xie Ziyao --- testcases/kernel/syscalls/chown/chown01.c | 8 +------- testcases/kernel/syscalls/chown/chown02.c | 9 +++------ testcases/kernel/syscalls/chown/chown03.c | 9 --------- testcases/kernel/syscalls/chown/chown04.c | 20 +++++++++++--------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c index 767a2ad5c..7fbb116bd 100644 --- a/testcases/kernel/syscalls/chown/chown01.c +++ b/testcases/kernel/syscalls/chown/chown01.c @@ -3,6 +3,7 @@ * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. * AUTHOR: William Roske * CO-PILOT: Dave Fenner + * Copyright (c) 2021 Xie Ziyao */ /*\ @@ -11,13 +12,6 @@ * Basic test for chown(). Calls chown() on a file and expects it to pass. */ -#include -#include -#include -#include -#include -#include - #include "tst_test.h" #include "compat_tst_16.h" diff --git a/testcases/kernel/syscalls/chown/chown02.c b/testcases/kernel/syscalls/chown/chown02.c index a92a1fd2d..7c96832a4 100644 --- a/testcases/kernel/syscalls/chown/chown02.c +++ b/testcases/kernel/syscalls/chown/chown02.c @@ -2,6 +2,7 @@ /* * Copyright (c) International Business Machines Corp., 2001 * 07/2001 Ported by Wayne Boyer + * Copyright (c) 2021 Xie Ziyao */ /*\ @@ -12,11 +13,6 @@ * - preserves setgid bit set on a non-group-executable file */ -#include -#include -#include -#include - #include "tst_test.h" #include "compat_tst_16.h" #include "tst_safe_macros.h" @@ -46,7 +42,8 @@ static void run(unsigned int i) SAFE_CHMOD(tc[i].filename, tc[i].set_mode); - TST_EXP_PASS(CHOWN(tc[i].filename, uid, gid)); + TST_EXP_PASS(CHOWN(tc[i].filename, uid, gid), "chown(%s, %d, %d)", + tc[i].filename, uid, gid); struct stat stat_buf; SAFE_STAT(tc[i].filename, &stat_buf); diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c index ff6e904be..b4ca3af73 100644 --- a/testcases/kernel/syscalls/chown/chown03.c +++ b/testcases/kernel/syscalls/chown/chown03.c @@ -17,15 +17,6 @@ * Also verify that chown() clears the setuid/setgid bits set on the file. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "tst_test.h" diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c index e7afa1422..4e9188567 100644 --- a/testcases/kernel/syscalls/chown/chown04.c +++ b/testcases/kernel/syscalls/chown/chown04.c @@ -54,15 +54,16 @@ static char long_path[PATH_MAX + 2] = {[0 ... PATH_MAX + 1] = 'a'}; static struct test_case_t { char *pathname; int exp_errno; + char *desc; } tc[] = { - {TEST_FILE1, EPERM}, - {TEST_FILE2, EACCES}, - {(char *)-1, EFAULT}, - {long_path, ENAMETOOLONG}, - {"", ENOENT}, - {TEST_FILE3, ENOTDIR}, - {TEST_FILE4, ELOOP}, - {TEST_FILE5, EROFS} + {TEST_FILE1, EPERM, "without permissions"}, + {TEST_FILE2, EACCES, "without full permissions of the path prefix"}, + {(char *)-1, EFAULT, "with unaccessible pathname points"}, + {long_path, ENAMETOOLONG, "when pathname is too long"}, + {"", ENOENT, "when file does not exist"}, + {TEST_FILE3, ENOTDIR, "when the path prefix is not a directory"}, + {TEST_FILE4, ELOOP, "with too many symbolic links"}, + {TEST_FILE5, EROFS, "when the named file resides on a read-only filesystem"} }; static void run(unsigned int i) @@ -73,7 +74,8 @@ static void run(unsigned int i) UID16_CHECK((uid = geteuid()), "chown"); GID16_CHECK((gid = getegid()), "chown"); - TST_EXP_FAIL(CHOWN(tc[i].pathname, uid, gid), tc[i].exp_errno); + TST_EXP_FAIL(CHOWN(tc[i].pathname, uid, gid), tc[i].exp_errno, + "chown() %s", tc[i].desc); } static void setup(void) -- 2.17.1