syscalls/access: Make use of TST_EXP_MACROS
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Acked-by: Li Wang <liwang@redhat.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c
index 1b73058..c9a076d 100644
--- a/testcases/kernel/syscalls/access/access01.c
+++ b/testcases/kernel/syscalls/access/access01.c
@@ -231,46 +231,15 @@
{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) {
+ TST_EXP_FAIL(access(tc->fname, tc->mode), tc->exp_errno,
+ "access(%s, %s) as %s", tc->fname, tc->name, user);
+ } else {
+ TST_EXP_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 db1d350..ff3e7b6 100644
--- a/testcases/kernel/syscalls/access/access02.c
+++ b/testcases/kernel/syscalls/access/access02.c
@@ -59,13 +59,11 @@
struct stat stat_buf;
char command[64];
- TEST(access(tc->pathname, tc->mode));
+ TST_EXP_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 612256c..ae3f676 100644
--- a/testcases/kernel/syscalls/access/access03.c
+++ b/testcases/kernel/syscalls/access/access03.c
@@ -26,34 +26,13 @@
{(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");
+ TST_EXP_FAIL(access(tc->addr, tc->mode), EFAULT,
+ "invalid address as root");
/* test as nobody */
pid = SAFE_FORK();
@@ -61,7 +40,8 @@
SAFE_WAITPID(pid, NULL, 0);
} else {
SAFE_SETUID(uid);
- access_test(tc, "nobody");
+ TST_EXP_FAIL(access(tc->addr, tc->mode), EFAULT,
+ "invalid address as nobody");
}
}
diff --git a/testcases/kernel/syscalls/access/access04.c b/testcases/kernel/syscalls/access/access04.c
index 328be1b..2d6dd70 100644
--- a/testcases/kernel/syscalls/access/access04.c
+++ b/testcases/kernel/syscalls/access/access04.c
@@ -58,21 +58,8 @@
static void access_test(struct tcase *tc, const char *user)
{
- TEST(access(tc->pathname, tc->mode));
-
- if (TST_RET != -1) {
- tst_res(TFAIL, "access as %s succeeded unexpectedly", user);
- return;
- }
-
- if (tc->exp_errno != TST_ERR) {
- tst_res(TFAIL | TTERRNO,
- "access as %s should fail with %s",
- user, tst_strerrno(tc->exp_errno));
- return;
- }
-
- tst_res(TPASS | TTERRNO, "access as %s failed expectedly", user);
+ TST_EXP_FAIL(access(tc->pathname, tc->mode), tc->exp_errno,
+ "access as %s", user);
}
static void verify_access(unsigned int n)
