mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-31 06:15:24 +00:00
test: add variable delta for poll.c test
For ZDTM purposes, poll.c uses delta of 5 seconds, which is fine, since tests don't take a very long time to pass. However, in vzt-cpt, we start a batch with multitude of tests and starting them all could take over an hour. Hence, the test is bound to fail. An easy solution would be to introduce an environment variable, which would allow to specify the delta - ZDTM_DELTA. If it's unset (which is default behaviour in ZDTM) - it would default to 5 seconds. However, if it's set (what we can do from vzt-cpt) - then it will use delta which is set by our test. travis-ci: success for test: add variable delta for poll.c test (rev2) Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com> Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
committed by
Pavel Emelyanov
parent
1418492fd2
commit
ae48b5d676
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
|
||||
int delta, status;
|
||||
task_waiter_t t;
|
||||
pid_t pid;
|
||||
char *deltaenv;
|
||||
|
||||
test_init(argc, argv);
|
||||
task_waiter_init(&t);
|
||||
@@ -80,6 +81,10 @@ int main(int argc, char *argv[])
|
||||
show_timestamp("Start", time1.tv_sec, time1.tv_usec);
|
||||
|
||||
task_waiter_complete(&t, 1);
|
||||
deltaenv = getenv("ZDTM_DELTA");
|
||||
if (deltaenv)
|
||||
delta = atoi(deltaenv);
|
||||
else
|
||||
delta = 5;
|
||||
while (test_go()) {
|
||||
ret = poll(ufds, 2, delta * 1000);
|
||||
|
Reference in New Issue
Block a user