From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Hrubis Date: Thu, 10 Dec 2020 15:15:48 +0100 Subject: [LTP] [PATCH v2 10/10] syscalls/open: Make use of TST_EXP_MACROS In-Reply-To: <20201210141548.10982-1-chrubis@suse.cz> References: <20201210141548.10982-1-chrubis@suse.cz> Message-ID: <20201210141548.10982-11-chrubis@suse.cz> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it In the newlib testcases at least. Signed-off-by: Cyril Hrubis --- testcases/kernel/syscalls/open/open01.c | 11 ++++------- testcases/kernel/syscalls/open/open02.c | 25 ++++++------------------- testcases/kernel/syscalls/open/open11.c | 22 ++++++++++------------ 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/testcases/kernel/syscalls/open/open01.c b/testcases/kernel/syscalls/open/open01.c index c689a4b9b..1172f832b 100644 --- a/testcases/kernel/syscalls/open/open01.c +++ b/testcases/kernel/syscalls/open/open01.c @@ -36,8 +36,8 @@ static struct tcase { unsigned short tst_bit; char *desc; } tcases[] = { - {TEST_FILE, O_RDWR | O_CREAT, 01444, S_ISVTX, "Sticky bit"}, - {TEST_DIR, O_DIRECTORY, 0, S_IFDIR, "Directory bit"} + {TEST_FILE, O_RDWR | O_CREAT, 01444, S_ISVTX, "sticky bit"}, + {TEST_DIR, O_DIRECTORY, 0, S_IFDIR, "sirectory bit"} }; static void verify_open(unsigned int n) @@ -45,12 +45,9 @@ static void verify_open(unsigned int n) struct tcase *tc = &tcases[n]; struct stat buf; - TEST(open(tc->filename, tc->flag, tc->mode)); + TST_EXP_FD(open(tc->filename, tc->flag, tc->mode), + "open() with %s", tc->desc); fd = TST_RET; - if (fd == -1) { - tst_res(TFAIL, "Cannot open a file"); - return; - } SAFE_FSTAT(fd, &buf); if (!(buf.st_mode & tc->tst_bit)) diff --git a/testcases/kernel/syscalls/open/open02.c b/testcases/kernel/syscalls/open/open02.c index 7195b1b6c..ca9839c2d 100644 --- a/testcases/kernel/syscalls/open/open02.c +++ b/testcases/kernel/syscalls/open/open02.c @@ -25,12 +25,13 @@ #define TEST_FILE2 "test_file2" static struct tcase { - char *filename; + const char *filename; int flag; int exp_errno; + const char *desc; } tcases[] = { - {TEST_FILE, O_RDWR, ENOENT}, - {TEST_FILE2, O_RDONLY | O_NOATIME, EPERM}, + {TEST_FILE, O_RDWR, ENOENT, "new file without O_CREAT"}, + {TEST_FILE2, O_RDONLY | O_NOATIME, EPERM, "unpriviledget O_RDONLY | O_NOATIME"}, }; void setup(void) @@ -48,22 +49,8 @@ static void verify_open(unsigned int n) { struct tcase *tc = &tcases[n]; - TEST(open(tc->filename, tc->flag, 0444)); - - if (TST_RET != -1) { - tst_res(TFAIL, "open(%s) succeeded unexpectedly", - tc->filename); - return; - } - - if (tc->exp_errno != TST_ERR) { - tst_res(TFAIL | TTERRNO, - "open() should fail with %s", - tst_strerrno(tc->exp_errno)); - return; - } - - tst_res(TPASS | TTERRNO, "open() failed as expected"); + TST_EXP_FAIL(open(tc->filename, tc->flag, 0444), + tc->exp_errno, "open() %s", tc->desc); } void cleanup(void) diff --git a/testcases/kernel/syscalls/open/open11.c b/testcases/kernel/syscalls/open/open11.c index cfd04fdcd..ded384fa8 100644 --- a/testcases/kernel/syscalls/open/open11.c +++ b/testcases/kernel/syscalls/open/open11.c @@ -277,21 +277,19 @@ static struct test_case { static void verify_open(unsigned int n) { - int fd; - - TEST(open(tc[n].path, tc[n].flags, tc[n].mode)); - fd = TST_RET; - - if (fd > 0) - SAFE_CLOSE(fd); - - if (tc[n].err == -1 || TST_ERR == tc[n].err) { + if (tc[n].err > 0) { + TST_EXP_FAIL(open(tc[n].path, tc[n].flags, tc[n].mode), + tc[n].err, "%s", tc[n].desc); + } else if (tc[n].err == 0) { + TST_EXP_FD(open(tc[n].path, tc[n].flags, tc[n].mode), + "%s", tc[n].desc); + } else { + TEST(open(tc[n].path, tc[n].flags, tc[n].mode)); tst_res(TPASS, "%s", tc[n].desc); - return; } - tst_res(TFAIL | TTERRNO, "%s - expected %s", - tc[n].desc, tst_strerrno(tc[n].err)); + if (TST_RET > 0) + SAFE_CLOSE(TST_RET); } static void setup(void) -- 2.26.2