From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 04/10] syscalls/access: Make use of TEST_MACROS
Date: Fri, 13 Nov 2020 14:14:22 +0100 [thread overview]
Message-ID: <20201113131428.13199-5-chrubis@suse.cz> (raw)
In-Reply-To: <20201113131428.13199-1-chrubis@suse.cz>
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/kernel/syscalls/access/access01.c | 43 ++++-----------------
testcases/kernel/syscalls/access/access02.c | 8 ++--
testcases/kernel/syscalls/access/access03.c | 28 ++------------
3 files changed, 14 insertions(+), 65 deletions(-)
diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c
index 1b73058d4..13cd2a51a 100644
--- a/testcases/kernel/syscalls/access/access01.c
+++ b/testcases/kernel/syscalls/access/access01.c
@@ -231,46 +231,17 @@ static struct tcase {
{DNAME_WX"/"FNAME_X, W_OK, "W_OK", EACCES, 1}
};
-static void verify_success(struct tcase *tc, const char *user)
-{
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO,
- "access(%s, %s) as %s failed unexpectedly",
- tc->fname, tc->name, user);
- return;
- }
-
- tst_res(TPASS, "access(%s, %s) as %s", tc->fname, tc->name, user);
-}
-
-static void verify_failure(struct tcase *tc, const char *user)
-{
- if (TST_RET != -1) {
- tst_res(TFAIL, "access(%s, %s) as %s succeded unexpectedly",
- tc->fname, tc->name, user);
- return;
- }
-
- if (TST_ERR != tc->exp_errno) {
- tst_res(TFAIL | TTERRNO,
- "access(%s, %s) as %s should fail with %s",
- tc->fname, tc->name, user,
- tst_strerrno(tc->exp_errno));
- return;
- }
-
- tst_res(TPASS | TTERRNO, "access(%s, %s) as %s",
- tc->fname, tc->name, user);
-}
-
static void access_test(struct tcase *tc, const char *user)
{
TEST(access(tc->fname, tc->mode));
- if (tc->exp_errno)
- verify_failure(tc, user);
- else
- verify_success(tc, user);
+ if (tc->exp_errno) {
+ TEST_FAIL(access(tc->fname, tc->mode), tc->exp_errno,
+ "access(%s, %s) as %s", tc->fname, tc->name, user);
+ } else {
+ TEST_PASS(access(tc->fname, tc->mode),
+ "access(%s, %s) as %s", tc->fname, tc->name, user);
+ }
}
static void verify_access(unsigned int n)
diff --git a/testcases/kernel/syscalls/access/access02.c b/testcases/kernel/syscalls/access/access02.c
index db1d350bf..3c4c1bb5e 100644
--- a/testcases/kernel/syscalls/access/access02.c
+++ b/testcases/kernel/syscalls/access/access02.c
@@ -59,13 +59,11 @@ static void access_test(struct tcase *tc, const char *user)
struct stat stat_buf;
char command[64];
- TEST(access(tc->pathname, tc->mode));
+ TEST_PASS(access(tc->pathname, tc->mode),
+ "access(%s, %s) as %s", tc->pathname, tc->name, user);
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "access(%s, %s) as %s failed",
- tc->pathname, tc->name, user);
+ if (!TST_PASS)
return;
- }
switch (tc->mode) {
case F_OK:
diff --git a/testcases/kernel/syscalls/access/access03.c b/testcases/kernel/syscalls/access/access03.c
index 612256c17..df20060d5 100644
--- a/testcases/kernel/syscalls/access/access03.c
+++ b/testcases/kernel/syscalls/access/access03.c
@@ -26,34 +26,13 @@ static struct tcase {
{(void *)-1, X_OK, "X_OK"},
};
-static void access_test(struct tcase *tc, const char *user)
-{
- TEST(access(tc->addr, tc->mode));
-
- if (TST_RET != -1) {
- tst_res(TFAIL, "access(%p, %s) as %s succeeded unexpectedly",
- tc->addr, tc->name, user);
- return;
- }
-
- if (TST_ERR != EFAULT) {
- tst_res(TFAIL | TTERRNO,
- "access(%p, %s) as %s should fail with EFAULT",
- tc->addr, tc->name, user);
- return;
- }
-
- tst_res(TPASS | TTERRNO, "access(%p, %s) as %s",
- tc->addr, tc->name, user);
-}
-
static void verify_access(unsigned int n)
{
struct tcase *tc = &tcases[n];
pid_t pid;
- /* test as root */
- access_test(tc, "root");
+ TEST_FAIL(access(tc->addr, tc->mode), EFAULT,
+ "invalid address as root");
/* test as nobody */
pid = SAFE_FORK();
@@ -61,7 +40,8 @@ static void verify_access(unsigned int n)
SAFE_WAITPID(pid, NULL, 0);
} else {
SAFE_SETUID(uid);
- access_test(tc, "nobody");
+ TEST_FAIL(access(tc->addr, tc->mode), EFAULT,
+ "invalid address as nobody");
}
}
--
2.26.2
next prev parent reply other threads:[~2020-11-13 13:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 13:14 [LTP] [PATCH 00/10] Introduce TEST_MACROS Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 01/10] lib: Introduce more TEST_* macros Cyril Hrubis
2020-11-13 20:28 ` Petr Vorel
2020-11-16 8:41 ` Li Wang
2020-11-19 13:08 ` Cyril Hrubis
2020-11-25 13:18 ` Cyril Hrubis
2020-11-25 13:33 ` Li Wang
2020-11-25 15:57 ` Cyril Hrubis
2020-11-26 2:17 ` Li Wang
2020-11-19 13:09 ` Cyril Hrubis
2020-11-25 16:54 ` Martin Doucha
2020-12-03 12:30 ` Cyril Hrubis
2020-12-03 14:34 ` Martin Doucha
2020-11-13 13:14 ` [LTP] [PATCH 02/10] syscalls/uname: Make use of TEST_MACROS Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 03/10] syscalls/accept: " Cyril Hrubis
2020-11-13 13:14 ` Cyril Hrubis [this message]
2020-11-13 13:14 ` [LTP] [PATCH 05/10] syscalls/bind: " Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 06/10] syscalls/brk01: " Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 07/10] syscalls/cacheflush: " Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 08/10] syscalls/capget: " Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 09/10] syscalls/capset: " Cyril Hrubis
2020-11-13 13:14 ` [LTP] [PATCH 10/10] syscalls/open: " Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201113131428.13199-5-chrubis@suse.cz \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox