kselftest: fix rtctest timeout
Subsystems (3)
Alexandre Belloni
maintainercover kselftest: fix rtctest timeout
Hi,
Commit a745f7af3cbd ("selftests/harness: Add 30 second timeout per test") wrongly assumed that no individual test would run for more than 30 seconds and this silently broke rtctest.
Please consider the following patches as fixes for v5.2 to avoid having any non working release.
Thanks,
Alexandre Belloni (2):
selftests/harness: Allow test to configure timeout
selftests: rtc: rtctest: specify timeouts
tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- tools/testing/selftests/rtc/rtctest.c | 6 +++--- 2 files changed, 15 insertions(+), 8 deletions(-)
Signature · 1 line
2.21.0
Alexandre Belloni
maintainerPATCH 1/2 selftests/harness: Allow test to configure timeout
Commit a745f7af3cbd ("selftests/harness: Add 30 second timeout per test") adds an hardcoded 30s timeout to all tests. Unfortunately, rtctest has two tests taking up to 60s. Allow for individual tests to define their own timeout.
--- tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
tools/testing/selftests/kselftest_harness.h +12 -5
@@ -62,6 +62,7 @@#include <sys/wait.h> #include <unistd.h> +#define TEST_TIMEOUT_DEFAULT 30/* Utilities exposed to the test definitions */ #ifndef TH_LOG_STREAM
@@ -169,7 +170,8 @@static void test_name (struct __test_metadata *_metadata); \ static struct __test_metadata _##test_name##_object = \ { .name = "global." #test_name, \ - .fn = &test_name, .termsig = _signal }; \ + .fn = &test_name, .termsig = _signal, \ + .timeout = TEST_TIMEOUT_DEFAULT, }; \ static void __attribute__((constructor)) _register_##test_name(void) \ { \ __register_test(&_##test_name##_object); \
@@ -280,12 +282,15 @@*/ /* TODO(wad) register fixtures on dedicated test lists. */ #define TEST_F (fixture_name, test_name) \ - __TEST_F_IMPL(fixture_name, test_name, -1) + __TEST_F_IMPL(fixture_name, test_name, -1, TEST_TIMEOUT_DEFAULT)#define TEST_F_SIGNAL (fixture_name, test_name, signal) \ - __TEST_F_IMPL(fixture_name, test_name, signal) + __TEST_F_IMPL(fixture_name, test_name, signal, TEST_TIMEOUT_DEFAULT) -#define __TEST_F_IMPL (fixture_name, test_name, signal) \ +#define TEST_F_TIMEOUT (fixture_name, test_name, timeout) \ + __TEST_F_IMPL(fixture_name, test_name, -1, timeout) + +#define __TEST_F_IMPL (fixture_name, test_name, signal, tmout) \ static void fixture_name##_##test_name( \ struct __test_metadata *_metadata, \ FIXTURE_DATA(fixture_name) *self); \
@@ -307,6 +312,7 @@ .name = #fixture_name "." #test_name, \ .fn = &wrapper_##fixture_name##_##test_name, \ .termsig = signal, \ + .timeout = tmout, \ }; \ static void __attribute__((constructor)) \ _register_##fixture_name##_##test_name(void) \
@@ -632,6 +638,7 @@ struct __test_metadata {int termsig;int passed;int trigger;/* extra handler after the evaluation */ +int timeout;__u8 step;bool no_print;/* manual trigger when TH_LOG_STREAM is not available */ struct __test_metadata *prev, *next;
@@ -696,7 +703,7 @@ void __run_test(struct __test_metadata *t) t->passed =1 ; t->trigger =0 ;printf ("[ RUN ] %s\n" , t->name); -alarm (30 ); +alarm (t->timeout); child_pid =fork ();if (child_pid <0 ) {printf ("ERROR SPAWNING TEST CHILD\n" );
Signature · 1 line
2.21.0
Re: [PATCH 1/2] selftests/harness: Allow test to configure timeout
Quoted 6 lines · Alexandre Belloni
Commit
a745f7af3cbd("selftests/harness: Add 30 second timeout per test") adds an hardcoded 30s timeout to all tests. Unfortunately, rtctest has two tests taking up to 60s. Allow for individual tests to define their own timeout.Signed-off-by Alexandre Belloni <alexandre.belloni at bootlin.com>
Ah yes. Very nice; thanks!
Quoted 73 lines
--- tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)tools/testing/selftests/kselftest_harness.h +12
-5@@ -62,6 +62,7 @@#include <sys/wait.h> #include <unistd.h> +#define TEST_TIMEOUT_DEFAULT 30/* Utilities exposed to the test definitions */ #ifndef TH_LOG_STREAM @@ -169,7 +170,8 @@static void test_name (struct __test_metadata *_metadata); \ static struct __test_metadata _##test_name##_object = \ { .name = "global." #test_name, \ - .fn = &test_name, .termsig = _signal }; \ + .fn = &test_name, .termsig = _signal, \ + .timeout = TEST_TIMEOUT_DEFAULT, }; \ static void __attribute__((constructor)) _register_##test_name(void) \ { \ __register_test(&_##test_name##_object); \@@ -280,12 +282,15 @@*/ /* TODO(wad) register fixtures on dedicated test lists. */ #define TEST_F (fixture_name, test_name) \ - __TEST_F_IMPL(fixture_name, test_name, -1) + __TEST_F_IMPL(fixture_name, test_name, -1, TEST_TIMEOUT_DEFAULT)#define TEST_F_SIGNAL (fixture_name, test_name, signal) \ - __TEST_F_IMPL(fixture_name, test_name, signal) + __TEST_F_IMPL(fixture_name, test_name, signal, TEST_TIMEOUT_DEFAULT) -#define __TEST_F_IMPL (fixture_name, test_name, signal) \ +#define TEST_F_TIMEOUT (fixture_name, test_name, timeout) \ + __TEST_F_IMPL(fixture_name, test_name, -1, timeout) + +#define __TEST_F_IMPL (fixture_name, test_name, signal, tmout) \ static void fixture_name##_##test_name( \ struct __test_metadata *_metadata, \ FIXTURE_DATA(fixture_name) *self); \@@ -307,6 +312,7 @@ .name = #fixture_name "." #test_name, \ .fn = &wrapper_##fixture_name##_##test_name, \ .termsig = signal, \ + .timeout = tmout, \ }; \ static void __attribute__((constructor)) \ _register_##fixture_name##_##test_name(void) \@@ -632,6 +638,7 @@ struct __test_metadata {int termsig;int passed;int trigger;/* extra handler after the evaluation */ +int timeout;__u8 step;bool no_print;/* manual trigger when TH_LOG_STREAM is not available */ struct __test_metadata *prev, *next;@@ -696,7 +703,7 @@ void __run_test(struct __test_metadata *t) t->passed =1 ; t->trigger =0 ;printf ("[ RUN ] %s\n" , t->name); -alarm (30 ); +alarm (t->timeout); child_pid =fork ();if (child_pid <0 ) {printf ("ERROR SPAWNING TEST CHILD\n" );Signature · 1 line
2.21.0
Signature · 1 line
Kees Cook
Alexandre Belloni
maintainerPATCH 2/2 selftests: rtc: rtctest: specify timeouts
In reply to Alexandre Belloniuie_read is a commonly failing test that will block forever on buggy rtc drivers. Shorten its timeout so it fails earlier. Also increase the timeout for the two alarm test on a minute boundary.
--- tools/testing/selftests/rtc/rtctest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/rtc/rtctest.c +3 -3
@@ -49,7 +49,7 @@ TEST_F(rtc, date_read) { rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); } -TEST_F(rtc, uie_read) { +TEST_F_TIMEOUT(rtc, uie_read, NUM_UIE + 2) {int i, rc, irq =0 ;unsigned long data;
@@ -211,7 +211,7 @@ TEST_F(rtc, alarm_wkalm_set) {ASSERT_EQ (new, secs); } -TEST_F(rtc, alarm_alm_set_minute) { +TEST_F_TIMEOUT(rtc, alarm_alm_set_minute, 65) {struct timeval tv = { .tv_sec =62 };unsigned long data;struct rtc_time tm;
@@ -264,7 +264,7 @@ TEST_F(rtc, alarm_alm_set_minute) {ASSERT_EQ (new, secs); } -TEST_F(rtc, alarm_wkalm_set_minute) { +TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) {struct timeval tv = { .tv_sec =62 };struct rtc_wkalrm alarm = {0 };struct rtc_time tm;
Signature · 1 line
2.21.0
Re: [PATCH 2/2] selftests: rtc: rtctest: specify timeouts
Quoted 5 lines · Alexandre Belloni
uie_readis a commonly failing test that will block forever on buggy rtc drivers. Shorten its timeout so it fails earlier. Also increase the timeout for the two alarm test on a minute boundary.Signed-off-by Alexandre Belloni <alexandre.belloni at bootlin.com>
Quoted 38 lines
--- tools/testing/selftests/rtc/rtctest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/testing/selftests/rtc/rtctest.c +3
-3@@ -49,7 +49,7 @@ TEST_F(rtc, date_read) { rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); } -TEST_F(rtc, uie_read) { +TEST_F_TIMEOUT(rtc, uie_read, NUM_UIE + 2) {int i, rc, irq =0 ;unsigned long data;@@ -211,7 +211,7 @@ TEST_F(rtc, alarm_wkalm_set) {ASSERT_EQ (new, secs); } -TEST_F(rtc, alarm_alm_set_minute) { +TEST_F_TIMEOUT(rtc, alarm_alm_set_minute, 65) {struct timeval tv = { .tv_sec =62 };unsigned long data;struct rtc_time tm;@@ -264,7 +264,7 @@ TEST_F(rtc, alarm_alm_set_minute) {ASSERT_EQ (new, secs); } -TEST_F(rtc, alarm_wkalm_set_minute) { +TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) {struct timeval tv = { .tv_sec =62 };struct rtc_wkalrm alarm = {0 };struct rtc_time tm;Signature · 1 line
2.21.0
Signature · 1 line
Kees Cook
shuah
maintainerQuoted 11 lines · Alexandre Belloni
Hi,
Commit
a745f7af3cbd("selftests/harness: Add 30 second timeout per test") wrongly assumed that no individual test would run for more than 30 seconds and this silently broke rtctest.Please consider the following patches as fixes for v5.2 to avoid having any non working release.
Thanks,
Quoted 8 lines
Alexandre Belloni (2):
selftests/harness: Allow test to configure timeout
selftests: rtc: rtctest: specify timeoutstools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- tools/testing/selftests/rtc/rtctest.c | 6 +++--- 2 files changed, 15 insertions(+), 8 deletions(-)
Thanks for fixing them quickly.
I will pull these in. I have one more fix from Kees already queued up.
Jeffrin! Would you like to test these to see if they work for you and send Tested-by tag.
I don't see 1/2 in my Inbox. I have Kees's reply to it. Odd.
thanks,
-- Shuah
shuah
maintainerQuoted 23 lines · shuah
Quoted 11 lines · Alexandre Belloni
Hi,
Commit
a745f7af3cbd("selftests/harness: Add 30 second timeout per test") wrongly assumed that no individual test would run for more than 30 seconds and this silently broke rtctest.Please consider the following patches as fixes for v5.2 to avoid having any non working release.
Thanks,
Quoted 8 lines
Alexandre Belloni (2):
selftests/harness: Allow test to configure timeout
selftests: rtc: rtctest: specify timeouts
tools/testing/selftests/kselftest_harness.h| 17 ++++++++++++----- tools/testing/selftests/rtc/rtctest.c | 6 +++---2 files changed, 15 insertions(+), 8 deletions(-)Thanks for fixing them quickly.
Quoted 8 lines
I will pull these in. I have one more fix from Kees already queued up.
Jeffrin! Would you like to test these to see if they work for you and send Tested-by tag.
I don't see 1/2 in my Inbox. I have Kees's reply to it. Odd.
It showed up late. I have 1/2 in my Inbox now. Must have taken a scenic route. :)
thanks,
-- Shuah