| Message ID | 20190523224223.11054-2-alexandre.belloni@bootlin.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d51f1f14870a3401dbcab0b737773bdc70f54a25 |
| Headers | show |
| Series | kselftest: fix rtctest timeout | expand |
On Fri, May 24, 2019 at 12:42:22AM +0200, Alexandre Belloni wrote: > 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@bootlin.com> Ah yes. Very nice; thanks! Reviewed-by: Kees Cook <keescook@chromium.org> > --- > tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h > index 941d9391377f..2067c6b0e8a1 100644 > --- a/tools/testing/selftests/kselftest_harness.h > +++ b/tools/testing/selftests/kselftest_harness.h > @@ -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"); > -- > 2.21.0 >
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 941d9391377f..2067c6b0e8a1 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -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");
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@bootlin.com> --- tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)