| From 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 Mon Sep 17 00:00:00 2001 |
| From: Po-Hsu Lin <po-hsu.lin@canonical.com> |
| Date: Wed, 18 Mar 2020 10:42:15 +0800 |
| Subject: [PATCH] selftests/timers: Turn off timeout setting |
| |
| commit 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 upstream. |
| |
| 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> |
| Acked-by: John Stultz <john.stultz@linaro.org> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| |
| diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile |
| index 7656c7ce79d9..0e73a16874c4 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 000000000000..e7b9417537fb |
| --- /dev/null |
| +++ b/tools/testing/selftests/timers/settings |
| @@ -0,0 +1 @@ |
| +timeout=0 |
| -- |
| 2.27.0 |
| |
