stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

timeout: Fixed --timeout always overriding

Browse source
This commit is contained in:
Snaipe 2016-09-05 10:20:23 +02:00
parent fbbfcb6d61
commit bd4760582f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/runner_coroutine.c
View file

@ -313,7 +313,7 @@ static bxf_instance *run_test(struct run_next_context *ctx,
timeout = ctx->suite_set->suite.data->timeout; timeout = ctx->suite_set->suite.data->timeout;
if (ctx->test->data->timeout > 0) if (ctx->test->data->timeout > 0)
timeout = ctx->test->data->timeout; timeout = ctx->test->data->timeout;
if (timeout > criterion_options.timeout) if (criterion_options.timeout > 0 && timeout > criterion_options.timeout)
timeout = criterion_options.timeout; timeout = criterion_options.timeout;
sp.iquotas.runtime = timeout; sp.iquotas.runtime = timeout;