Re: [PATCH 1/2] tests: make timeout configurable with NOTMUCH_TEST_TIMEOUT (default: 2m)

2019-05-20 Thread David Bremner
Tomi Ollila  writes:

> On Mon, May 20 2019, Daniel Kahn Gillmor wrote:
>
>> The current 2 minute timeout is reasonable, but to exercise the test
>> suite or induce timeout failures, we might want to make it shorter.
>> This makes it configurable so you can run (for example):
>>
>> make check NOTMUCH_TEST_TIMEOUT=10s
>>
>> We stick with the default of 2m.
>>
>> Signed-off-by: Daniel Kahn Gillmor 
>
>
> Series LGTM.
>
> Tomi

series pushed.

d
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH 1/2] tests: make timeout configurable with NOTMUCH_TEST_TIMEOUT (default: 2m)

2019-05-20 Thread Tomi Ollila
On Mon, May 20 2019, Daniel Kahn Gillmor wrote:

> The current 2 minute timeout is reasonable, but to exercise the test
> suite or induce timeout failures, we might want to make it shorter.
> This makes it configurable so you can run (for example):
>
> make check NOTMUCH_TEST_TIMEOUT=10s
>
> We stick with the default of 2m.
>
> Signed-off-by: Daniel Kahn Gillmor 


Series LGTM.

Tomi


> ---
>  test/notmuch-test | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/test/notmuch-test b/test/notmuch-test
> index bd3e080a..dbca39ca 100755
> --- a/test/notmuch-test
> +++ b/test/notmuch-test
> @@ -32,8 +32,9 @@ rm -rf $NOTMUCH_BUILDDIR/test/test-results
>  
>  # Test for timeout utility
>  if command -v timeout >/dev/null; then
> -TEST_TIMEOUT_CMD="timeout 2m"
> -echo "INFO: using 2 minute timeout for tests"
> +TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
> +TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
> +echo "INFO: using $TEST_TIMEOUT timeout for tests"
>  else
>  TEST_TIMEOUT_CMD=""
>  fi
> -- 
> 2.20.1
>
> ___
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch


[PATCH 1/2] tests: make timeout configurable with NOTMUCH_TEST_TIMEOUT (default: 2m)

2019-05-20 Thread Daniel Kahn Gillmor
The current 2 minute timeout is reasonable, but to exercise the test
suite or induce timeout failures, we might want to make it shorter.
This makes it configurable so you can run (for example):

make check NOTMUCH_TEST_TIMEOUT=10s

We stick with the default of 2m.

Signed-off-by: Daniel Kahn Gillmor 
---
 test/notmuch-test | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/notmuch-test b/test/notmuch-test
index bd3e080a..dbca39ca 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -32,8 +32,9 @@ rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
 # Test for timeout utility
 if command -v timeout >/dev/null; then
-TEST_TIMEOUT_CMD="timeout 2m"
-echo "INFO: using 2 minute timeout for tests"
+TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
+TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
+echo "INFO: using $TEST_TIMEOUT timeout for tests"
 else
 TEST_TIMEOUT_CMD=""
 fi
-- 
2.20.1

___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch