It's possible that a parameterised test could end up with zero parameters. At the moment, the test function will nevertheless be called with NULL as the parameter. Instead, don't try to run the test code, and just mark the test as SKIPped.
Reported-by: Daniel Latypov dlatypov@google.com Signed-off-by: David Gow davidgow@google.com ---
Changes since v2: https://lore.kernel.org/linux-kselftest/20211027013702.2039566-3-davidgow@go... - Rework to not share the loop between the parameterised and non-parameterised test cases. - Suggested by Daniel Latypov. - Avoids using a magic non-zero pointer value.
lib/kunit/test.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 3bd741e50a2d..dfe1127aacfd 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -508,12 +508,12 @@ int kunit_run_tests(struct kunit_suite *suite) /* Get initial param. */ param_desc[0] = '\0'; test.param_value = test_case->generate_params(NULL, param_desc); - } + kunit_log(KERN_INFO, &test, KUNIT_SUBTEST_INDENT KUNIT_SUBTEST_INDENT + "# Subtest: %s", test_case->name);
- do { - kunit_run_case_catch_errors(suite, test_case, &test); + while (test.param_value) { + kunit_run_case_catch_errors(suite, test_case, &test);
- if (test_case->generate_params) { if (param_desc[0] == '\0') { snprintf(param_desc, sizeof(param_desc), "param-%d", test.param_index); @@ -530,11 +530,15 @@ int kunit_run_tests(struct kunit_suite *suite) param_desc[0] = '\0'; test.param_value = test_case->generate_params(test.param_value, param_desc); test.param_index++; - }
+ kunit_update_stats(¶m_stats, test.status); + } + } else { + /* Non-parameterised test. */ + kunit_run_case_catch_errors(suite, test_case, &test); kunit_update_stats(¶m_stats, test.status); + }
- } while (test.param_value);
kunit_print_test_stats(&test, param_stats);