]> git.proxmox.com Git - mirror_lxc.git/commitdiff
tests: cleanup destroytest.c
author2xsec <dh48.jeong@samsung.com>
Tue, 3 Jul 2018 09:16:30 +0000 (18:16 +0900)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 3 Jul 2018 10:44:38 +0000 (12:44 +0200)
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
src/tests/destroytest.c

index b8ba8055d78ede4082dd4bbb31c58638facea178..79549120e44294acfe1d5feefa024eeb0c0c295b 100644 (file)
@@ -37,24 +37,30 @@ static int create_container(void)
                perror("fork");
                return -1;
        }
+
        if (pid == 0) {
                execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
                exit(EXIT_FAILURE);
        }
+
 again:
        ret = waitpid(pid, &status, 0);
        if (ret == -1) {
                if (errno == EINTR)
                        goto again;
+
                perror("waitpid");
                return -1;
        }
+
        if (ret != pid)
                goto again;
+
        if (!WIFEXITED(status))  { // did not exit normally
                fprintf(stderr, "%d: lxc-create exited abnormally\n", __LINE__);
                return -1;
        }
+
        return WEXITSTATUS(status);
 }
 
@@ -96,6 +102,7 @@ int main(int argc, char *argv[])
 
        fprintf(stderr, "all lxc_container tests passed for %s\n", c->name);
        ret = 0;
+
 out:
        lxc_container_put(c);
        exit(ret);