Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 00:11:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Drop support for test commands

Browse source 
Now that everything is using the new test-suite features, drop support
for running commands.

Fix a missing closing-bracket while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-02-07 11:30:54 -07:00 • committed by Tom Rini
parent 7c9f4625a5
commit 59713c412a
2 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/test/suites.h
View file

@ -7,14 +7,9 @@
#ifndef __TEST_SUITES_H__ #ifndef __TEST_SUITES_H__
#define __TEST_SUITES_H__ #define __TEST_SUITES_H__
struct cmd_tbl;
struct unit_test; struct unit_test;
struct unit_test_state; struct unit_test_state;
/* 'command' functions normally called do_xxx where xxx is the command name */
typedef int (*ut_cmd_func)(struct unit_test_state *uts, struct cmd_tbl *cmd,
int flags, int argc, char *const argv[]);
/** /**
* cmd_ut_category() - Run a category of unit tests * cmd_ut_category() - Run a category of unit tests
* *

37
test/cmd_ut.c
View file

@ -20,14 +20,12 @@
* @name: Name of suite * @name: Name of suite
* @start: First test in suite * @start: First test in suite
* @end: End test in suite (points to the first test in the next suite) * @end: End test in suite (points to the first test in the next suite)
* @cmd: Command to use to run the suite
* @help: Help-string to show for this suite * @help: Help-string to show for this suite
*/ */
struct suite { struct suite {
const char *name; const char *name;
struct unit_test *start; struct unit_test *start;
struct unit_test *end; struct unit_test *end;
ut_cmd_func cmd;
const char *help; const char *help;
}; };
@ -76,21 +74,11 @@ int cmd_ut_category(struct unit_test_state *uts, const char *name,
ll_start_decl(suite_start_ ## _name, struct unit_test, ut_ ## _name); \ ll_start_decl(suite_start_ ## _name, struct unit_test, ut_ ## _name); \
ll_end_decl(suite_end_ ## _name, struct unit_test, ut_ ## _name) ll_end_decl(suite_end_ ## _name, struct unit_test, ut_ ## _name)
/* declare a test suite which uses a subcommand to run */
#define SUITE_CMD(_name, _cmd_func, _help) { \
#_name, \
suite_start_ ## _name, \
suite_end_ ## _name, \
_cmd_func, \
_help, \
}
/* declare a test suite which can be run directly without a subcommand */ /* declare a test suite which can be run directly without a subcommand */
#define SUITE(_name, _help) { \ #define SUITE(_name, _help) { \
#_name, \ #_name, \
suite_start_ ## _name, \ suite_start_ ## _name, \
suite_end_ ## _name, \ suite_end_ ## _name, \
NULL, \
_help, \ _help, \
} }
@ -161,7 +149,7 @@ static bool has_tests(struct suite *ste)
{ {
int n_ents = ste->end - ste->start; int n_ents = ste->end - ste->start;
return n_ents || ste->cmd; return n_ents;
} }
/** run_suite() - Run a suite of tests */ /** run_suite() - Run a suite of tests */
@ -169,19 +157,15 @@ static int run_suite(struct unit_test_state *uts, struct suite *ste,
struct cmd_tbl *cmdtp, int flag, int argc, struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
{ {
int ret;
if (ste->cmd) {
ret = ste->cmd(uts, cmdtp, flag, argc, argv);
} else {
int n_ents = ste->end - ste->start; int n_ents = ste->end - ste->start;
char prefix[30]; char prefix[30];
int ret;
/* use a standard prefix */ /* use a standard prefix */
snprintf(prefix, sizeof(prefix), "%s_test_", ste->name); snprintf(prefix, sizeof(prefix), "%s_test_", ste->name);
ret = cmd_ut_category(uts, ste->name, prefix, ste->start, ret = cmd_ut_category(uts, ste->name, prefix, ste->start, n_ents,
n_ents, argc, argv); argc, argv);
}
return ret; return ret;
} }
@ -266,15 +250,12 @@ static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc,
struct suite *ste = &suites[i]; struct suite *ste = &suites[i];
long n_ent = ste->end - ste->start; long n_ent = ste->end - ste->start;
if (n_ent) if (n_ent) {
printf("%5ld", n_ent); printf("%5ld %-13.13s %s\n", n_ent, ste->name,
else if (ste->cmd) ste->help);
printf("%5s", "?");
else /* suite is not present */
continue;
printf(" %-13.13s %s\n", ste->name, ste->help);
total += n_ent; total += n_ent;
} }
}
puts("----- ------------ -------------------------\n"); puts("----- ------------ -------------------------\n");
printf("%5d %-13.13s\n", total, "Total"); printf("%5d %-13.13s\n", total, "Total");