Commit 4c3068cf authored by Andrei Vagin's avatar Andrei Vagin Committed by Pavel Emelyanov

zdtm: call test_init() before doing anything

test_init() has to be executed first, because it prepares a container.

travis-ci: success for series starting with [1/3] zdtm: call test_init() before doing anything
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 02cdd46d
...@@ -452,14 +452,14 @@ int main(int argc, char ** argv) ...@@ -452,14 +452,14 @@ int main(int argc, char ** argv)
task_waiter_t child_waiter; task_waiter_t child_waiter;
int pfd[2], fd; int pfd[2], fd;
test_init(argc, argv);
task_waiter_init(&child_waiter); task_waiter_init(&child_waiter);
memset(zero_page, 0, sizeof(zero_page)); memset(zero_page, 0, sizeof(zero_page));
datasum(zero_page, sizeof(zero_page), &zero_crc); datasum(zero_page, sizeof(zero_page), &zero_crc);
test_init(argc, argv);
if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, pfd)) { if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, pfd)) {
pr_perror("pipe"); pr_perror("pipe");
return 1; return 1;
......
...@@ -29,8 +29,8 @@ int main(int argc, char **argv) ...@@ -29,8 +29,8 @@ int main(int argc, char **argv)
pid_t pid = -1; pid_t pid = -1;
int status = 1; int status = 1;
task_waiter_init(&lock);
test_init(argc, argv); test_init(argc, argv);
task_waiter_init(&lock);
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {
......
...@@ -29,9 +29,10 @@ int main(int argc, char **argv) ...@@ -29,9 +29,10 @@ int main(int argc, char **argv)
pid_t pid = -1; pid_t pid = -1;
int status = 1; int status = 1;
task_waiter_init(&lock);
test_init(argc, argv); test_init(argc, argv);
task_waiter_init(&lock);
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {
pr_perror("fork"); pr_perror("fork");
......
...@@ -66,11 +66,11 @@ int main(int argc, char *argv[]) ...@@ -66,11 +66,11 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
test_init(argc, argv);
task_waiter_wait4(&lock, 1); task_waiter_wait4(&lock, 1);
task_waiter_fini(&lock); task_waiter_fini(&lock);
test_init(argc, argv);
sk = socket(AF_UNIX, SOCK_DGRAM, 0); sk = socket(AF_UNIX, SOCK_DGRAM, 0);
if (sk < 0) { if (sk < 0) {
pr_perror("Can't create socket"); pr_perror("Can't create socket");
......
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