Skip to content

L
lxc
Unverified Commit 32068a26 by Christian Brauner Committed by Stéphane Graber
Options

tests: remove dead assignments

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent f0475785
Showing with 16 additions and 32 deletions
src/tests/containertests.c
...@@ -40,10 +40,8 @@ static int destroy_busybox(void) ...@@ -40,10 +40,8 @@ static int destroy_busybox(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL); execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
...@@ -72,10 +70,8 @@ static int create_busybox(void) ...@@ -72,10 +70,8 @@ static int create_busybox(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL); execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
......
src/tests/destroytest.c
...@@ -38,10 +38,8 @@ static int create_container(void) ...@@ -38,10 +38,8 @@ static int create_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL); execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
......
src/tests/saveconfig.c
...@@ -38,10 +38,8 @@ static int create_container(void) ...@@ -38,10 +38,8 @@ static int create_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL); execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
......
src/tests/shortlived.c
...@@ -40,10 +40,8 @@ static int destroy_container(void) ...@@ -40,10 +40,8 @@ static int destroy_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL); execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
...@@ -72,10 +70,8 @@ static int create_container(void) ...@@ -72,10 +70,8 @@ static int create_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL); execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
......
src/tests/startone.c
...@@ -40,10 +40,8 @@ static int destroy_container(void) ...@@ -40,10 +40,8 @@ static int destroy_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL); execlp("lxc-destroy", "lxc-destroy", "-f", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 0);
...@@ -72,10 +70,8 @@ static int create_container(void) ...@@ -72,10 +70,8 @@ static int create_container(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL); execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return exit(EXIT_FAILURE);
perror("execl");
exit(1);
} }
again: again:
ret = waitpid(pid, &status, 0); ret = waitpid(pid, &status, 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