test: Drop the info test from the list

The 'info' test is not a real test. With the new suite array we can drop
this and the associated special-case code.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-01-20 14:25:56 -07:00 committed by Tom Rini
parent 0af17462b9
commit 81c5434f49
2 changed files with 6 additions and 11 deletions

View file

@ -93,7 +93,6 @@ int cmd_ut_category(const char *name, const char *prefix,
NULL, \
}
SUITE_DECL(info);
SUITE_DECL(bdinfo);
SUITE_DECL(bootstd);
SUITE_DECL(cmd);
@ -121,7 +120,6 @@ SUITE_DECL(seama);
SUITE_DECL(upl);
static struct suite suites[] = {
SUITE_CMD(info, do_ut_info),
#ifdef CONFIG_CMD_BDI
SUITE(bdinfo),
#endif
@ -249,7 +247,7 @@ static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc,
puts("\nTests Suite\n");
puts("----- -----\n");
for (i = 1; i < ARRAY_SIZE(suites); i++) {
for (i = 0; i < ARRAY_SIZE(suites); i++) {
struct suite *ste = &suites[i];
long n_ent = ste->end - ste->start;

View file

@ -8,7 +8,7 @@ import re
EXPECTED_SUITES = [
'addrmap', 'bdinfo', 'bloblist', 'bootm', 'bootstd',
'cmd', 'common', 'dm', 'env', 'exit',
'fdt', 'font', 'hush', 'info', 'lib',
'fdt', 'font', 'hush', 'lib',
'loadm', 'log', 'mbr', 'measurement', 'mem',
'overlay', 'pci_mps', 'setexpr', 'upl',
]
@ -153,9 +153,8 @@ def test_suite(u_boot_console):
cons.log.info(f'missing {missing}')
cons.log.info(f'extra {extra}')
# Make sure we got a test count for each suite (ignore 'info' since it isn't
# a real suite
assert suites - exp_test_count.keys() == {'info'}
# Make sure we got a test count for each suite
assert suites - exp_test_count.keys() == set()
# Run 'ut info' and compare with the log results
with cons.log.section('Check suite test-counts'):
@ -174,10 +173,8 @@ def test_suite(u_boot_console):
cons.log.info(str(exp_test_count))
for suite in EXPECTED_SUITES:
# 'info' is not really a suite, just a subcommand of 'ut'
if suite != 'info':
assert test_count[suite] in ['?', str(exp_test_count[suite])],\
f'suite {suite} expected {exp_test_count[suite]}'
assert test_count[suite] in ['?', str(exp_test_count[suite])], \
f'suite {suite} expected {exp_test_count[suite]}'
assert suite_count == len(EXPECTED_SUITES)
assert total_test_count == len(all_tests)