@@ -18,24 +18,17 @@ static void verify_uname(void)
memset(&un, 0, sizeof(un));
- TEST(uname(&un));
- if (TST_RET == -1) {
- tst_res(TFAIL | TTERRNO, "uname() failed");
- return;
- }
+ TEST_PASS(uname(&un));
- if (TST_RET != 0) {
- tst_res(TFAIL | TTERRNO,
- "uname() returned invalid value %ld", TST_RET);
+ if (!TST_PASS)
return;
- }
if (strcmp(un.sysname, "Linux")) {
tst_res(TFAIL, "sysname is not Linux");
return;
}
- tst_res(TPASS, "uname() succeeded");
+ tst_res(TPASS, "sysname set to Linux");
}
static struct tst_test test = {
@@ -16,22 +16,7 @@ static void *bad_addr;
static void verify_uname(void)
{
- TEST(uname(bad_addr));
- if (TST_RET == 0) {
- tst_res(TFAIL, "uname() succeed when failure expected");
- return;
- }
-
- if (TST_RET != -1) {
- tst_res(TFAIL, "Invalid uname() return value %ld", TST_RET);
- return;
- }
-
- if (TST_ERR == EFAULT)
- tst_res(TPASS, "uname() got EFAULT as expected");
- else
- tst_res(TFAIL | TTERRNO, "uname() failed unexpectedly");
-
+ TEST_FAIL(uname(bad_addr), EFAULT);
}
static void setup(void)
Signed-off-by: Cyril Hrubis <chrubis@suse.cz> --- testcases/kernel/syscalls/uname/uname01.c | 13 +++---------- testcases/kernel/syscalls/uname/uname02.c | 17 +---------------- 2 files changed, 4 insertions(+), 26 deletions(-)