UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

kunit: Update kunit_print_ok_not_ok function 

There is no need use opaque test_or_suite pointer and is_test flag
as we don't use anything from the suite struct. Always expect test
pointer and use NULL as indication that provided results are from
the suite so we can treat them differently.

Since results could be from nested tests, like parameterized tests,
add explicit level parameter to properly indent output messages and
thus allow to reuse this function from other places.

While around, remove small code duplication near skip directive.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: David Gow <davidgow@google.com>
Cc: Rae Moar <rmoar@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Michal Wajdeczko 2023-05-17 13:18:16 +02:00 committed by Shuah Khan
parent b08f75b9bb
commit b1eaa8b2a5
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/kunit/test.h
View File

@ -47,6 +47,7 @@ struct kunit;
* sub-subtest. See the "Subtests" section in * sub-subtest. See the "Subtests" section in
* https://node-tap.org/tap-protocol/ * https://node-tap.org/tap-protocol/
*/ */
#define KUNIT_INDENT_LEN 4
#define KUNIT_SUBTEST_INDENT " " #define KUNIT_SUBTEST_INDENT " "
#define KUNIT_SUBSUBTEST_INDENT " " #define KUNIT_SUBSUBTEST_INDENT " "

45
lib/kunit/test.c
View File

@ -185,16 +185,28 @@ static void kunit_print_suite_start(struct kunit_suite *suite)
kunit_suite_num_test_cases(suite)); kunit_suite_num_test_cases(suite));
} }
static void kunit_print_ok_not_ok(void *test_or_suite, /* Currently supported test levels */
bool is_test, enum {
KUNIT_LEVEL_SUITE = 0,
KUNIT_LEVEL_CASE,
KUNIT_LEVEL_CASE_PARAM,
};
static void kunit_print_ok_not_ok(struct kunit *test,
unsigned int test_level,
enum kunit_status status, enum kunit_status status,
size_t test_number, size_t test_number,
const char *description, const char *description,
const char *directive) const char *directive)
{ {
struct kunit_suite *suite = is_test ? NULL : test_or_suite;
struct kunit *test = is_test ? test_or_suite : NULL;
const char *directive_header = (status == KUNIT_SKIPPED) ? " # SKIP " : ""; const char *directive_header = (status == KUNIT_SKIPPED) ? " # SKIP " : "";
const char *directive_body = (status == KUNIT_SKIPPED) ? directive : "";
/*
* When test is NULL assume that results are from the suite
* and today suite results are expected at level 0 only.
*/
WARN(!test && test_level, "suite test level can't be %u!\n", test_level);
/* /*
* We do not log the test suite results as doing so would * We do not log the test suite results as doing so would
@ -203,17 +215,18 @@ static void kunit_print_ok_not_ok(void *test_or_suite,
* separately seq_printf() the suite results for the debugfs * separately seq_printf() the suite results for the debugfs
* representation. * representation.
*/ */
if (suite) if (!test)
pr_info("%s %zd %s%s%s\n", pr_info("%s %zd %s%s%s\n",
kunit_status_to_ok_not_ok(status), kunit_status_to_ok_not_ok(status),
test_number, description, directive_header, test_number, description, directive_header,
(status == KUNIT_SKIPPED) ? directive : ""); directive_body);
else else
kunit_log(KERN_INFO, test, kunit_log(KERN_INFO, test,
KUNIT_SUBTEST_INDENT "%s %zd %s%s%s", "%*s%s %zd %s%s%s",
KUNIT_INDENT_LEN * test_level, "",
kunit_status_to_ok_not_ok(status), kunit_status_to_ok_not_ok(status),
test_number, description, directive_header, test_number, description, directive_header,
(status == KUNIT_SKIPPED) ? directive : ""); directive_body);
} }
enum kunit_status kunit_suite_has_succeeded(struct kunit_suite *suite) enum kunit_status kunit_suite_has_succeeded(struct kunit_suite *suite)
@ -239,7 +252,7 @@ static size_t kunit_suite_counter = 1;
static void kunit_print_suite_end(struct kunit_suite *suite) static void kunit_print_suite_end(struct kunit_suite *suite)
{ {
kunit_print_ok_not_ok((void *)suite, false, kunit_print_ok_not_ok(NULL, KUNIT_LEVEL_SUITE,
kunit_suite_has_succeeded(suite), kunit_suite_has_succeeded(suite),
kunit_suite_counter++, kunit_suite_counter++,
suite->name, suite->name,
@ -625,13 +638,11 @@ int kunit_run_tests(struct kunit_suite *suite)
"param-%d", test.param_index); "param-%d", test.param_index);
} }
kunit_log(KERN_INFO, &test, kunit_print_ok_not_ok(&test, KUNIT_LEVEL_CASE_PARAM,
KUNIT_SUBTEST_INDENT KUNIT_SUBTEST_INDENT test.status,
"%s %d %s%s%s", test.param_index + 1,
kunit_status_to_ok_not_ok(test.status), param_desc,
test.param_index + 1, param_desc, test.status_comment);
test.status == KUNIT_SKIPPED ? " # SKIP " : "",
test.status == KUNIT_SKIPPED ? test.status_comment : "");
/* Get next param. */ /* Get next param. */
param_desc[0] = '\0'; param_desc[0] = '\0';
@ -645,7 +656,7 @@ int kunit_run_tests(struct kunit_suite *suite)
kunit_print_test_stats(&test, param_stats); kunit_print_test_stats(&test, param_stats);
kunit_print_ok_not_ok(&test, true, test_case->status, kunit_print_ok_not_ok(&test, KUNIT_LEVEL_CASE, test_case->status,
kunit_test_case_num(suite, test_case), kunit_test_case_num(suite, test_case),
test_case->name, test_case->name,
test.status_comment); test.status_comment);