Commit c971d7a9 authored by Andrei Vagin's avatar Andrei Vagin Committed by Pavel Emelyanov

zdtm/socket-ext: clean up test files

Reported-by: 's avatarDmitry Safonov <dima@arista.com>
Cc: Dmitry Safonov <dima@arista.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@openvz.org>
Reviewed-by: 's avatarDmitry Safonov <dima@arista.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 061c21e6
...@@ -29,11 +29,26 @@ int main(int argc, char *argv[]) ...@@ -29,11 +29,26 @@ int main(int argc, char *argv[])
char *path; char *path;
pid_t pid; pid_t pid;
int ret, sk; int ret, sk;
char *val;
unsetenv("ZDTM_GROUPS");
val = getenv("ZDTM_GID");
if (val && (setgid(atoi(val)) == -1)) {
fprintf(stderr, "Can't set gid: %m");
exit(1);
}
val = getenv("ZDTM_UID");
if (val && (setuid(atoi(val)) == -1)) {
fprintf(stderr, "Can't set uid: %m");
exit(1);
}
if (mkdtemp(dir) < 0) { if (mkdtemp(dir) < 0) {
pr_perror("mkdtemp(%s) failed", dir); pr_perror("mkdtemp(%s) failed", dir);
return 1; return 1;
} }
chmod(dir, 0777);
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), snprintf(addr.sun_path, sizeof(addr.sun_path),
"%s/%s", dir, "sock"); "%s/%s", dir, "sock");
...@@ -92,8 +107,14 @@ int main(int argc, char *argv[]) ...@@ -92,8 +107,14 @@ int main(int argc, char *argv[])
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
unlink(path); if (unlink(path)) {
unlink(dir); pr_perror("Unable to remove %s\n", path);
return 1;
}
if (rmdir(dir)) {
pr_perror("Unable to remove %s", dir);
return 1;
}
ret = send(sk, "H", 1, 0); ret = send(sk, "H", 1, 0);
if (ret != 1) { if (ret != 1) {
......
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