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 ---
test/cmd_ut.c | 4 +--- test/py/tests/test_suite.py | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 0d055119ce3..798710972e5 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -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 @@ -247,7 +245,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;
diff --git a/test/py/tests/test_suite.py b/test/py/tests/test_suite.py index ed636bbde74..938dfb468f6 100644 --- a/test/py/tests/test_suite.py +++ b/test/py/tests/test_suite.py @@ -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', ] @@ -145,9 +145,8 @@ def test_suite(u_boot_console): suites, all_tests, exp_test_count, missing, extra = collect_info(cons, output)
- # 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'): @@ -166,10 +165,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)