Commit 1094c358 authored by Kinsbursky Stanislav's avatar Kinsbursky Stanislav Committed by Andrey Vagin

zdtm: update static/utsname test due to ns isolation changes

v2: fixed returning zero (errno) value in case of sys_write() didn't fail.
Signed-off-by: 's avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: 's avatarAndrey Vagin <avagin@gmail.com>
parent 9b598d01
...@@ -13,7 +13,7 @@ static struct utsname after; ...@@ -13,7 +13,7 @@ static struct utsname after;
#define ZDTM_NODE "zdtm.nodename.ru" #define ZDTM_NODE "zdtm.nodename.ru"
#define ZDTM_DOMAIN "zdtm.nodename.ru" #define ZDTM_DOMAIN "zdtm.nodename.ru"
static void test_fn(void) static int test_fn(int argc, char **argv)
{ {
int ret; int ret;
int fd; int fd;
...@@ -21,13 +21,13 @@ static void test_fn(void) ...@@ -21,13 +21,13 @@ static void test_fn(void)
fd = open("/proc/sys/kernel/hostname", O_WRONLY); fd = open("/proc/sys/kernel/hostname", O_WRONLY);
if (fd < 0) { if (fd < 0) {
err("Can't open hostname\n"); err("Can't open hostname\n");
return; return 1;
} }
ret = write(fd, ZDTM_NODE, sizeof(ZDTM_NODE)); ret = write(fd, ZDTM_NODE, sizeof(ZDTM_NODE));
if (ret != sizeof(ZDTM_NODE)) { if (ret != sizeof(ZDTM_NODE)) {
err("Can't write nodename\n"); err("Can't write nodename\n");
return; return 1;
} }
close(fd); close(fd);
...@@ -35,13 +35,13 @@ static void test_fn(void) ...@@ -35,13 +35,13 @@ static void test_fn(void)
fd = open("/proc/sys/kernel/domainname", O_WRONLY); fd = open("/proc/sys/kernel/domainname", O_WRONLY);
if (fd < 0) { if (fd < 0) {
err("Can't open domainname\n"); err("Can't open domainname\n");
return; return -errno;
} }
ret = write(fd, ZDTM_DOMAIN, sizeof(ZDTM_DOMAIN)); ret = write(fd, ZDTM_DOMAIN, sizeof(ZDTM_DOMAIN));
if (ret != sizeof(ZDTM_DOMAIN)) { if (ret != sizeof(ZDTM_DOMAIN)) {
err("Can't write domainname\n"); err("Can't write domainname\n");
return; return 1;
} }
close(fd); close(fd);
...@@ -51,23 +51,21 @@ static void test_fn(void) ...@@ -51,23 +51,21 @@ static void test_fn(void)
uname(&after); uname(&after);
ret = 1;
if (strcmp(ZDTM_NODE, after.nodename)) { if (strcmp(ZDTM_NODE, after.nodename)) {
ret = 0;
fail("Nodename doesn't match"); fail("Nodename doesn't match");
return 1;
} }
if (strcmp(ZDTM_DOMAIN, after.__domainname)) { if (strcmp(ZDTM_DOMAIN, after.__domainname)) {
ret = 0;
fail("Domainname doesn't match"); fail("Domainname doesn't match");
return 1;
} }
if (ret) pass();
pass(); return 0;
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
test_init_ns(argc, argv, CLONE_NEWUTS, test_fn); test_init_ns(argc, argv, CLONE_NEWUTS, test_fn);
return -1; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment