[PATCHv3] selftests/timers: Turn off timeout setting

[PATCHv3] selftests/timers: Turn off timeout setting

[Po-Hsu Lin]

The following 4 tests in timers can take longer than the default 45
seconds that added in commit 852c8cbf34d3 ("selftests/kselftest/runner.sh:
Add 45 second timeout per test") to run:
  * nsleep-lat - 2m7.350s
  * set-timer-lat - 2m0.66s
  * inconsistency-check - 1m45.074s
  * raw_skew - 2m0.013s

Thus they will be marked as failed with the current 45s setting:
  not ok 3 selftests: timers: nsleep-lat # TIMEOUT
  not ok 4 selftests: timers: set-timer-lat # TIMEOUT
  not ok 6 selftests: timers: inconsistency-check # TIMEOUT
  not ok 7 selftests: timers: raw_skew # TIMEOUT

Disable the timeout setting for timers can make these tests finish
properly:
  ok 3 selftests: timers: nsleep-lat
  ok 4 selftests: timers: set-timer-lat
  ok 6 selftests: timers: inconsistency-check
  ok 7 selftests: timers: raw_skew

https://bugs.launchpad.net/bugs/1864626
Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test")
Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
---
 tools/testing/selftests/timers/Makefile | 1 +
 tools/testing/selftests/timers/settings | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 tools/testing/selftests/timers/settings

diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
index 7656c7c..0e73a16 100644
--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \
 
 TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
 
+TEST_FILES := settings
 
 include ../lib.mk
 
diff --git a/tools/testing/selftests/timers/settings b/tools/testing/selftests/timers/settings
new file mode 100644
index 0000000..e7b9417
--- /dev/null
+++ b/tools/testing/selftests/timers/settings
@@ -0,0 +1 @@
+timeout=0
-- 
2.7.4

Re: [PATCHv3] selftests/timers: Turn off timeout setting

[Po-Hsu Lin]

(Adding Shuah's linuxfoundation mail)
Hello,
do you need more changes / tests for this test?

Thanks!
Po-Hsu

On Wed, Mar 18, 2020 at 10:42 AM Po-Hsu Lin <po-hsu.lin@canonical.com> wrote:
>
> The following 4 tests in timers can take longer than the default 45
> seconds that added in commit 852c8cbf34d3 ("selftests/kselftest/runner.sh:
> Add 45 second timeout per test") to run:
>   * nsleep-lat - 2m7.350s
>   * set-timer-lat - 2m0.66s
>   * inconsistency-check - 1m45.074s
>   * raw_skew - 2m0.013s
>
> Thus they will be marked as failed with the current 45s setting:
>   not ok 3 selftests: timers: nsleep-lat # TIMEOUT
>   not ok 4 selftests: timers: set-timer-lat # TIMEOUT
>   not ok 6 selftests: timers: inconsistency-check # TIMEOUT
>   not ok 7 selftests: timers: raw_skew # TIMEOUT
>
> Disable the timeout setting for timers can make these tests finish
> properly:
>   ok 3 selftests: timers: nsleep-lat
>   ok 4 selftests: timers: set-timer-lat
>   ok 6 selftests: timers: inconsistency-check
>   ok 7 selftests: timers: raw_skew
>
> https://bugs.launchpad.net/bugs/1864626
> Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test")
> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> ---
>  tools/testing/selftests/timers/Makefile | 1 +
>  tools/testing/selftests/timers/settings | 1 +
>  2 files changed, 2 insertions(+)
>  create mode 100644 tools/testing/selftests/timers/settings
>
> diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
> index 7656c7c..0e73a16 100644
> --- a/tools/testing/selftests/timers/Makefile
> +++ b/tools/testing/selftests/timers/Makefile
> @@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \
>
>  TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
>
> +TEST_FILES := settings
>
>  include ../lib.mk
>
> diff --git a/tools/testing/selftests/timers/settings b/tools/testing/selftests/timers/settings
> new file mode 100644
> index 0000000..e7b9417
> --- /dev/null
> +++ b/tools/testing/selftests/timers/settings
> @@ -0,0 +1 @@
> +timeout=0
> --
> 2.7.4
>

Re: [PATCHv3] selftests/timers: Turn off timeout setting

[Shuah Khan]

On 7/23/20 3:01 AM, Po-Hsu Lin wrote:
> (Adding Shuah's linuxfoundation mail)
> Hello,
> do you need more changes / tests for this test?
> 
> Thanks!
> Po-Hsu
> 

I was hoping to get Ack from timers test maintainers.

Will pull this in for my fixes update.

thanks,
-- Shuah

Re: [PATCHv3] selftests/timers: Turn off timeout setting

[John Stultz]

On Tue, Mar 17, 2020 at 7:42 PM Po-Hsu Lin <po-hsu.lin@canonical.com> wrote:
>
> The following 4 tests in timers can take longer than the default 45
> seconds that added in commit 852c8cbf34d3 ("selftests/kselftest/runner.sh:
> Add 45 second timeout per test") to run:
>   * nsleep-lat - 2m7.350s
>   * set-timer-lat - 2m0.66s
>   * inconsistency-check - 1m45.074s
>   * raw_skew - 2m0.013s
>
> Thus they will be marked as failed with the current 45s setting:
>   not ok 3 selftests: timers: nsleep-lat # TIMEOUT
>   not ok 4 selftests: timers: set-timer-lat # TIMEOUT
>   not ok 6 selftests: timers: inconsistency-check # TIMEOUT
>   not ok 7 selftests: timers: raw_skew # TIMEOUT
>
> Disable the timeout setting for timers can make these tests finish
> properly:
>   ok 3 selftests: timers: nsleep-lat
>   ok 4 selftests: timers: set-timer-lat
>   ok 6 selftests: timers: inconsistency-check
>   ok 7 selftests: timers: raw_skew
>
> https://bugs.launchpad.net/bugs/1864626
> Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test")
> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> ---
>  tools/testing/selftests/timers/Makefile | 1 +
>  tools/testing/selftests/timers/settings | 1 +
>  2 files changed, 2 insertions(+)
>  create mode 100644 tools/testing/selftests/timers/settings
>
> diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
> index 7656c7c..0e73a16 100644
> --- a/tools/testing/selftests/timers/Makefile
> +++ b/tools/testing/selftests/timers/Makefile
> @@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \
>
>  TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
>
> +TEST_FILES := settings
>
>  include ../lib.mk
>
> diff --git a/tools/testing/selftests/timers/settings b/tools/testing/selftests/timers/settings
> new file mode 100644
> index 0000000..e7b9417
> --- /dev/null
> +++ b/tools/testing/selftests/timers/settings
> @@ -0,0 +1 @@
> +timeout=0
> --

Apologies for missing this before.  I've not tested with this, but it
sounds sane to me. A number of the timekeeping tests do take a while
to run.

Acked-by: John Stultz <john.stultz@linaro.org>

thanks
-john

Re: [PATCHv3] selftests/timers: Turn off timeout setting

[Shuah Khan]

On 8/4/20 3:38 PM, John Stultz wrote:
> On Tue, Mar 17, 2020 at 7:42 PM Po-Hsu Lin <po-hsu.lin@canonical.com> wrote:
>>
>> The following 4 tests in timers can take longer than the default 45
>> seconds that added in commit 852c8cbf34d3 ("selftests/kselftest/runner.sh:
>> Add 45 second timeout per test") to run:
>>    * nsleep-lat - 2m7.350s
>>    * set-timer-lat - 2m0.66s
>>    * inconsistency-check - 1m45.074s
>>    * raw_skew - 2m0.013s
>>
>> Thus they will be marked as failed with the current 45s setting:
>>    not ok 3 selftests: timers: nsleep-lat # TIMEOUT
>>    not ok 4 selftests: timers: set-timer-lat # TIMEOUT
>>    not ok 6 selftests: timers: inconsistency-check # TIMEOUT
>>    not ok 7 selftests: timers: raw_skew # TIMEOUT
>>
>> Disable the timeout setting for timers can make these tests finish
>> properly:
>>    ok 3 selftests: timers: nsleep-lat
>>    ok 4 selftests: timers: set-timer-lat
>>    ok 6 selftests: timers: inconsistency-check
>>    ok 7 selftests: timers: raw_skew
>>
>> https://bugs.launchpad.net/bugs/1864626
>> Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test")
>> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
>> ---
>>   tools/testing/selftests/timers/Makefile | 1 +
>>   tools/testing/selftests/timers/settings | 1 +
>>   2 files changed, 2 insertions(+)
>>   create mode 100644 tools/testing/selftests/timers/settings
>>
>> diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
>> index 7656c7c..0e73a16 100644
>> --- a/tools/testing/selftests/timers/Makefile
>> +++ b/tools/testing/selftests/timers/Makefile
>> @@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \
>>
>>   TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS)
>>
>> +TEST_FILES := settings
>>
>>   include ../lib.mk
>>
>> diff --git a/tools/testing/selftests/timers/settings b/tools/testing/selftests/timers/settings
>> new file mode 100644
>> index 0000000..e7b9417
>> --- /dev/null
>> +++ b/tools/testing/selftests/timers/settings
>> @@ -0,0 +1 @@
>> +timeout=0
>> --
> 
> Apologies for missing this before.  I've not tested with this, but it
> sounds sane to me. A number of the timekeeping tests do take a while
> to run.
> 
> Acked-by: John Stultz <john.stultz@linaro.org>
> 

Thanks. I will get this in for 5.9-rc2 fixes update.

thanks,
-- Shuah