diff options
author | David Gow <davidgow@google.com> | 2021-11-02 00:30:13 -0700 |
---|---|---|
committer | Shuah Khan <skhan@linuxfoundation.org> | 2021-12-13 13:36:21 -0700 |
commit | 37dbb4c7c7442dbfc9b651e4ddd4afe30b26afc9 (patch) | |
tree | 2351f89a8a09e729bae637404531998ebb815d46 /lib/kunit | |
parent | e56e482855b782b0e38b91cc383324bb80461073 (diff) | |
download | linux-stable-37dbb4c7c7442dbfc9b651e4ddd4afe30b26afc9.tar.gz linux-stable-37dbb4c7c7442dbfc9b651e4ddd4afe30b26afc9.tar.bz2 linux-stable-37dbb4c7c7442dbfc9b651e4ddd4afe30b26afc9.zip |
kunit: Don't crash if no parameters are generated
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>
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'lib/kunit')
-rw-r--r-- | lib/kunit/test.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 3bd741e50a2d..f96498ede2cc 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -504,16 +504,18 @@ int kunit_run_tests(struct kunit_suite *suite) struct kunit_result_stats param_stats = { 0 }; test_case->status = KUNIT_SKIPPED; - if (test_case->generate_params) { + if (!test_case->generate_params) { + /* Non-parameterised test. */ + kunit_run_case_catch_errors(suite, test_case, &test); + kunit_update_stats(¶m_stats, test.status); + } else { /* Get initial param. */ param_desc[0] = '\0'; test.param_value = test_case->generate_params(NULL, param_desc); - } - 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 +532,11 @@ 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); + kunit_update_stats(¶m_stats, test.status); + } + } - } while (test.param_value); kunit_print_test_stats(&test, param_stats); |