3f05f087c3
In the function cmd_ut_category, the prefix is used with
the function strncmp to know if the prefix should be
removed from the test name, even if the prefix is NULL.
To avoid this issue, we consider that a prefix NULL
mean no prefix. So we only try to remove the prefix
from the test_name if the prefix is not NULL, then
we avoid to call the function strncmp with a NULL
prefix.
Reported-by: Coverity CID 281110
Fixes: 4ad4edfe ("cmd_ut: add a parameter prefix to the function cmd_ut_category")
Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
148 lines
3.6 KiB
C
148 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* (C) Copyright 2015
|
|
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <test/suites.h>
|
|
#include <test/test.h>
|
|
|
|
static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
|
|
|
|
int cmd_ut_category(const char *name, const char *prefix,
|
|
struct unit_test *tests, int n_ents,
|
|
int argc, char * const argv[])
|
|
{
|
|
struct unit_test_state uts = { .fail_count = 0 };
|
|
struct unit_test *test;
|
|
int prefix_len = prefix ? strlen(prefix) : 0;
|
|
|
|
if (argc == 1)
|
|
printf("Running %d %s tests\n", n_ents, name);
|
|
|
|
for (test = tests; test < tests + n_ents; test++) {
|
|
const char *test_name = test->name;
|
|
|
|
/* Remove the prefix */
|
|
if (prefix && !strncmp(test_name, prefix, prefix_len))
|
|
test_name += prefix_len;
|
|
|
|
if (argc > 1 && strcmp(argv[1], test_name))
|
|
continue;
|
|
printf("Test: %s\n", test->name);
|
|
|
|
uts.start = mallinfo();
|
|
|
|
test->func(&uts);
|
|
}
|
|
|
|
printf("Failures: %d\n", uts.fail_count);
|
|
|
|
return uts.fail_count ? CMD_RET_FAILURE : 0;
|
|
}
|
|
|
|
static cmd_tbl_t cmd_ut_sub[] = {
|
|
U_BOOT_CMD_MKENT(all, CONFIG_SYS_MAXARGS, 1, do_ut_all, "", ""),
|
|
#if defined(CONFIG_UT_DM)
|
|
U_BOOT_CMD_MKENT(dm, CONFIG_SYS_MAXARGS, 1, do_ut_dm, "", ""),
|
|
#endif
|
|
#if defined(CONFIG_UT_ENV)
|
|
U_BOOT_CMD_MKENT(env, CONFIG_SYS_MAXARGS, 1, do_ut_env, "", ""),
|
|
#endif
|
|
#ifdef CONFIG_UT_OPTEE
|
|
U_BOOT_CMD_MKENT(optee, CONFIG_SYS_MAXARGS, 1, do_ut_optee, "", ""),
|
|
#endif
|
|
#ifdef CONFIG_UT_OVERLAY
|
|
U_BOOT_CMD_MKENT(overlay, CONFIG_SYS_MAXARGS, 1, do_ut_overlay, "", ""),
|
|
#endif
|
|
#ifdef CONFIG_UT_LIB
|
|
U_BOOT_CMD_MKENT(lib, CONFIG_SYS_MAXARGS, 1, do_ut_lib, "", ""),
|
|
#endif
|
|
#ifdef CONFIG_UT_TIME
|
|
U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""),
|
|
#endif
|
|
#if CONFIG_IS_ENABLED(UT_UNICODE) && !defined(API_BUILD)
|
|
U_BOOT_CMD_MKENT(unicode, CONFIG_SYS_MAXARGS, 1, do_ut_unicode, "", ""),
|
|
#endif
|
|
#ifdef CONFIG_SANDBOX
|
|
U_BOOT_CMD_MKENT(compression, CONFIG_SYS_MAXARGS, 1, do_ut_compression,
|
|
"", ""),
|
|
U_BOOT_CMD_MKENT(bloblist, CONFIG_SYS_MAXARGS, 1, do_ut_bloblist,
|
|
"", ""),
|
|
#endif
|
|
};
|
|
|
|
static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
int i;
|
|
int retval;
|
|
int any_fail = 0;
|
|
|
|
for (i = 1; i < ARRAY_SIZE(cmd_ut_sub); i++) {
|
|
printf("----Running %s tests----\n", cmd_ut_sub[i].name);
|
|
retval = cmd_ut_sub[i].cmd(cmdtp, flag, 1, &cmd_ut_sub[i].name);
|
|
if (!any_fail)
|
|
any_fail = retval;
|
|
}
|
|
|
|
return any_fail;
|
|
}
|
|
|
|
static int do_ut(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
cmd_tbl_t *cp;
|
|
|
|
if (argc < 2)
|
|
return CMD_RET_USAGE;
|
|
|
|
/* drop initial "ut" arg */
|
|
argc--;
|
|
argv++;
|
|
|
|
cp = find_cmd_tbl(argv[0], cmd_ut_sub, ARRAY_SIZE(cmd_ut_sub));
|
|
|
|
if (cp)
|
|
return cp->cmd(cmdtp, flag, argc, argv);
|
|
|
|
return CMD_RET_USAGE;
|
|
}
|
|
|
|
#ifdef CONFIG_SYS_LONGHELP
|
|
static char ut_help_text[] =
|
|
"all - execute all enabled tests\n"
|
|
#ifdef CONFIG_SANDBOX
|
|
"ut bloblist - Test bloblist implementation\n"
|
|
"ut compression - Test compressors and bootm decompression\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_DM
|
|
"ut dm [test-name]\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_ENV
|
|
"ut env [test-name]\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_LIB
|
|
"ut lib [test-name] - test library functions\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_OPTEE
|
|
"ut optee [test-name]\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_OVERLAY
|
|
"ut overlay [test-name]\n"
|
|
#endif
|
|
#ifdef CONFIG_UT_TIME
|
|
"ut time - Very basic test of time functions\n"
|
|
#endif
|
|
#if defined(CONFIG_UT_UNICODE) && \
|
|
!defined(CONFIG_SPL_BUILD) && !defined(API_BUILD)
|
|
"ut unicode [test-name] - test Unicode functions\n"
|
|
#endif
|
|
;
|
|
#endif /* CONFIG_SYS_LONGHELP */
|
|
|
|
U_BOOT_CMD(
|
|
ut, CONFIG_SYS_MAXARGS, 1, do_ut,
|
|
"unit tests", ut_help_text
|
|
);
|