[LTP] [PATCH 09/10] syscalls/capset: Make use of TEST_MACROS

Cyril Hrubis
2020-11-13T13:14:27Z

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/kernel/syscalls/capset/capset01.c | 14 ++++-------
testcases/kernel/syscalls/capset/capset02.c | 28 +++++++--------------
testcases/kernel/syscalls/capset/capset03.c | 10 +-------
testcases/kernel/syscalls/capset/capset04.c | 13 +++-------
4 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/testcases/kernel/syscalls/capset/capset01.c b/testcases/kernel/syscalls/capset/capset01.c
index f8540539d..da0fc8113 100644
--- a/testcases/kernel/syscalls/capset/capset01.c
+++ b/testcases/kernel/syscalls/capset/capset01.c
@@ -20,16 +20,15 @@ static struct tcase {
int version;
char *message;
} tcases[] = {
- {0x19980330, "Test on LINUX_CAPABILITY_VERSION_1"},
- {0x20071026, "Test on LINUX_CAPABILITY_VERSION_2"},
- {0x20080522, "Test on LINUX_CAPABILITY_VERSION_3"},
+ {0x19980330, "LINUX_CAPABILITY_VERSION_1"},
+ {0x20071026, "LINUX_CAPABILITY_VERSION_2"},
+ {0x20080522, "LINUX_CAPABILITY_VERSION_3"},
};

static void verify_capset(unsigned int n)
{
struct tcase *tc = &tcases[n];

- tst_res(TINFO, "%s", tc->message);
header->version = tc->version;
header->pid = pid;

@@ -38,11 +37,8 @@ static void verify_capset(unsigned int n)
return;
}

- TEST(tst_syscall(__NR_capset, header, data));
- if (TST_RET == 0)
- tst_res(TPASS, "capset() returned %ld", TST_RET);
- else
- tst_res(TFAIL | TTERRNO, "Test Failed, capset() returned %ld", TST_RET);
+ TEST_PASS(tst_syscall(__NR_capset, header, data),
+ "capset() with %s", tc->message);
}

static void setup(void)
diff --git a/testcases/kernel/syscalls/capset/capset02.c b/testcases/kernel/syscalls/capset/capset02.c
index a6c4f29a0..d45b52297 100644
--- a/testcases/kernel/syscalls/capset/capset02.c
+++ b/testcases/kernel/syscalls/capset/capset02.c
@@ -43,12 +43,12 @@ static struct tcase {
int flag;
char *message;
} tcases[] = {
- {0x20080522, 0, CAP1, CAP1, CAP1, EFAULT, 1, "Test bad address header"},
- {0x20080522, 0, CAP1, CAP1, CAP1, EFAULT, 2, "Test bad address data"},
- {0, 0, CAP1, CAP1, CAP1, EINVAL, 0, "Test bad version"},
- {0x20080522, 0, CAP2, CAP1, CAP1, EPERM, 0, "Test bad value data(when pE is not in pP)"},
- {0x20080522, 0, CAP1, CAP2, CAP1, EPERM, 0, "Test bad value data(when pP is not in old pP)"},
- {0x20080522, 0, CAP1, CAP1, CAP2, EPERM, 0, "Test bad value data(when pI is not in bounding set or old pI)"},
+ {0x20080522, 0, CAP1, CAP1, CAP1, EFAULT, 1, "bad address header"},
+ {0x20080522, 0, CAP1, CAP1, CAP1, EFAULT, 2, "bad address data"},
+ {0, 0, CAP1, CAP1, CAP1, EINVAL, 0, "bad version"},
+ {0x20080522, 0, CAP2, CAP1, CAP1, EPERM, 0, "bad value data(when pE is not in pP)"},
+ {0x20080522, 0, CAP1, CAP2, CAP1, EPERM, 0, "bad value data(when pP is not in old pP)"},
+ {0x20080522, 0, CAP1, CAP1, CAP2, EPERM, 0, "bad value data(when pI is not in bounding set or old pI)"},
};

static void verify_capset(unsigned int n)
@@ -62,19 +62,9 @@ static void verify_capset(unsigned int n)
data->permitted = tc->permitted;
data->inheritable = tc->inheritable;

- tst_res(TINFO, "%s", tc->message);
-
- TEST(tst_syscall(__NR_capset, tc->flag - 1 ? header : bad_addr,
- tc->flag - 2 ? data : bad_addr));
- if (TST_RET == 0) {
- tst_res(TFAIL, "capset() succeed unexpectedly");
- return;
- }
- if (TST_ERR == tc->exp_err)
- tst_res(TPASS | TTERRNO, "capset() failed as expected");
- else
- tst_res(TFAIL | TTERRNO, "capset() expected %s got ",
- tst_strerrno(tc->exp_err));
+ TEST_FAIL(tst_syscall(__NR_capset, tc->flag - 1 ? header : bad_addr,
+ tc->flag - 2 ? data : bad_addr),
+ tc->exp_err, "capset() with %s", tc->message);
/*
* When an unsupported version value is specified, it will
* return the kernel preferred value of _LINUX_CAPABILITY_VERSION_?.
diff --git a/testcases/kernel/syscalls/capset/capset03.c b/testcases/kernel/syscalls/capset/capset03.c
index d5754753d..b8eb826d0 100644
--- a/testcases/kernel/syscalls/capset/capset03.c
+++ b/testcases/kernel/syscalls/capset/capset03.c
@@ -23,15 +23,7 @@ static void verify_capset(void)
{
tst_res(TINFO, "Test bad value data(when pI is not old pP or old pI without CAP_SETPCAP)");
data[0].inheritable = CAP2;
- TEST(tst_syscall(__NR_capset, header, data));
- if (TST_RET == 0) {
- tst_res(TFAIL, "capset succeed unexpectedly");
- return;
- }
- if (TST_ERR == EPERM)
- tst_res(TPASS | TTERRNO, "capset() failed as expected");
- else
- tst_res(TFAIL | TTERRNO, "capset expected EPERM, bug got");
+ TEST_FAIL(tst_syscall(__NR_capset, header, data), EPERM, "capset()");
}

static void setup(void)
diff --git a/testcases/kernel/syscalls/capset/capset04.c b/testcases/kernel/syscalls/capset/capset04.c
index 81ad7a35f..b5aeff19f 100644
--- a/testcases/kernel/syscalls/capset/capset04.c
+++ b/testcases/kernel/syscalls/capset/capset04.c
@@ -24,18 +24,11 @@ static void verify_capset(void)
if (!child_pid)
pause();

- header->pid = child_pid;
+ tst_res(TINFO, "Test capset() for a different process");

- TEST(tst_syscall(__NR_capset, header, data));
- if (TST_RET == 0) {
- tst_res(TFAIL, "capset succeed unexpectedly");
- return;
- }
+ header->pid = child_pid;

- if (TST_ERR == EPERM)
- tst_res(TPASS, "capset can't modify other process capabilities");
- else
- tst_res(TFAIL | TTERRNO, "capset expected EPERM, bug got");
+ TEST_FAIL(tst_syscall(__NR_capset, header, data), EPERM, "capset()");

SAFE_KILL(child_pid, SIGTERM);
SAFE_WAIT(NULL);
--
2.26.2