smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Enhance the ut command to pass test arguments

Browse Source 
Update the ut command to permit passing arguments to tests.

Usage: ut -f fs test_name key1=value1 key2=value2

Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2025-12-12 14:24:13 -07:00
parent a3b60a2094
commit 64850634f0
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/cmd_ut.c
View File

@@ -30,7 +30,7 @@ struct suite {
static int do_ut_all(struct unit_test_state *uts, const char *select_name,
int runs_per_test, bool force_run,
const char *test_insert);
const char *test_insert, int argc, char *const argv[]);
static int do_ut_info(bool show_suites);
@@ -122,7 +122,7 @@ static bool has_tests(struct suite *ste)
/** run_suite() - Run a suite of tests */
static int run_suite(struct unit_test_state *uts, struct suite *ste,
const char *select_name, int runs_per_test, bool force_run,
const char *test_insert)
const char *test_insert, int argc, char *const argv[])
{
int n_ents = ste->end - ste->start;
char prefix[30];
@@ -133,7 +133,7 @@ static int run_suite(struct unit_test_state *uts, struct suite *ste,
ret = ut_run_list(uts, ste->name, prefix, ste->start, n_ents,
select_name, runs_per_test, force_run, test_insert,
0, NULL);
argc, argv);
return ret;
}
@@ -169,7 +169,8 @@ static void update_stats(struct unit_test_state *uts, const struct suite *ste)
}
static int do_ut_all(struct unit_test_state *uts, const char *select_name,
int runs_per_test, bool force_run, const char *test_insert)
int runs_per_test, bool force_run, const char *test_insert,
int argc, char *const argv[])
{
int i;
int retval;
@@ -181,7 +182,7 @@ static int do_ut_all(struct unit_test_state *uts, const char *select_name,
if (has_tests(ste)) {
printf("----Running %s tests----\n", ste->name);
retval = run_suite(uts, ste, select_name, runs_per_test,
force_run, test_insert);
force_run, test_insert, argc, argv);
if (!any_fail)
any_fail = retval;
update_stats(uts, ste);
@@ -246,6 +247,8 @@ static struct suite *find_suite(const char *name)
static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
const char *test_insert = NULL, *select_name;
int test_argc;
char *const *test_argv;
struct unit_test_state uts;
bool show_suites = false;
bool force_run = false;
@@ -287,9 +290,14 @@ static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
ut_init_state(&uts);
name = argv[0];
select_name = cmd_arg1(argc, argv);
/* Test arguments are after suite name and test name */
test_argc = argc > 2 ? argc - 2 : 0;
test_argv = argc > 2 ? argv + 2 : NULL;
if (!strcmp(name, "all")) {
ret = do_ut_all(&uts, select_name, runs_per_text, force_run,
test_insert);
test_insert, test_argc, test_argv);
} else if (!strcmp(name, "info")) {
ret = do_ut_info(show_suites);
} else {
@@ -308,7 +316,8 @@ static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
}
ret = run_suite(&uts, ste, select_name, runs_per_text,
force_run, test_insert);
force_run, test_insert, test_argc,
test_argv);
if (!any_fail)
any_fail = ret;
update_stats(&uts, ste);
@@ -324,12 +333,14 @@ static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
}
U_BOOT_LONGHELP(ut,
"[-rs] [-f] [-I<n>:<one_test>][<suites>] - run unit tests\n"
"[-rs] [-f] [-I<n>:<one_test>] <suite> [<test> [<args>...]] - run unit tests\n"
" -r<runs> Number of times to run each test\n"
" -f Force 'manual' tests to run as well\n"
" -I Test to run after <n> other tests have run\n"
" -s Show all suites with ut info\n"
" <suites> Comma-separated list of suites to run\n"
" <suite> Test suite to run (or comma-separated list)\n"
" <test> Specific test to run (optional)\n"
" <args> Test arguments as key=value pairs (optional)\n"
"\n"
"Options for <suite>:\n"
"all - execute all enabled tests\n"