Rename this function and test_set_state() so use the same ut_ prefix as other functions in ut.h

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/ut.h | 8 ++++---- test/dm/test-driver.c | 10 +++++----- test/dm/test-uclass.c | 8 ++++---- test/test-main.c | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/test/ut.h b/include/test/ut.h index c8838dad096..2e4d8edf826 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -466,18 +466,18 @@ void ut_unsilence_console(struct unit_test_state *uts); void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);

/** - * test_get_state() - Get the active test state + * ut_state_get() - Get the active test state * * Return: the currently active test state, or NULL if none */ -struct unit_test_state *test_get_state(void); +struct unit_test_state *ut_get_state(void);

/** - * test_set_state() - Set the active test state + * ut_set_state() - Set the active test state * * @uts: Test state to use as currently active test state, or NULL if none */ -void test_set_state(struct unit_test_state *uts); +void ut_set_state(struct unit_test_state *uts);

/** * ut_run_tests() - Run a set of tests diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 851177c3018..759de3a5f77 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -35,7 +35,7 @@ static const struct test_ops test_ops = {

static int test_bind(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

/* Private data should not be allocated */ ut_assert(!dev_get_priv(dev)); @@ -46,7 +46,7 @@ static int test_bind(struct udevice *dev)

static int test_probe(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state(); struct dm_test_priv *priv = dev_get_priv(dev);

/* Private data should be allocated */ @@ -59,7 +59,7 @@ static int test_probe(struct udevice *dev)

static int test_remove(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

/* Private data should still be allocated */ ut_assert(dev_get_priv(dev)); @@ -70,7 +70,7 @@ static int test_remove(struct udevice *dev)

static int test_unbind(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

/* Private data should not be allocated */ ut_assert(!dev_get_priv(dev)); @@ -121,7 +121,7 @@ static int test_manual_bind(struct udevice *dev)

static int test_manual_probe(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

dm_testdrv_op_count[DM_TEST_OP_PROBE]++; if (!uts->force_fail_alloc) diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 9a80cc63667..be4108bbecb 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -28,7 +28,7 @@ int test_ping(struct udevice *dev, int pingval, int *pingret)

static int test_post_bind(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state(); struct dm_test_perdev_uc_pdata *uc_pdata;

dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; @@ -54,7 +54,7 @@ static int test_pre_unbind(struct udevice *dev) static int test_pre_probe(struct udevice *dev) { struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev); - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++; ut_assert(priv); @@ -65,7 +65,7 @@ static int test_pre_probe(struct udevice *dev)

static int test_post_probe(struct udevice *dev) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state(); struct udevice *prev = list_entry(dev->uclass_node.prev, struct udevice, uclass_node);

@@ -100,7 +100,7 @@ static int test_pre_remove(struct udevice *dev)

static int test_init(struct uclass *uc) { - struct unit_test_state *uts = test_get_state(); + struct unit_test_state *uts = ut_get_state();

dm_testdrv_op_count[DM_TEST_OP_INIT]++; ut_assert(uclass_get_priv(uc)); diff --git a/test/test-main.c b/test/test-main.c index 8d764892fa6..cfb3504941d 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -63,12 +63,12 @@ static enum fdtchk_t fdt_action(void) /* This is valid when a test is running, NULL otherwise */ static struct unit_test_state *cur_test_state;

-struct unit_test_state *test_get_state(void) +struct unit_test_state *ut_get_state(void) { return cur_test_state; }

-void test_set_state(struct unit_test_state *uts) +void ut_set_state(struct unit_test_state *uts) { cur_test_state = uts; } @@ -466,7 +466,7 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test, printf("Test: %s: %s%s\n", test_name, fname, note);

/* Allow access to test state from drivers */ - test_set_state(uts); + ut_set_state(uts);

ret = test_pre_run(uts, test); if (ret == -EAGAIN) @@ -482,7 +482,7 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test, if (ret) return ret;

- test_set_state( NULL); + ut_set_state(NULL);

return 0; }

Pass this into the function so that callers can inspect the state afterwards.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

arch/sandbox/cpu/spl.c | 5 ++++- include/test/ut.h | 29 ++++++++++++++++++++++++++--- test/cmd_ut.c | 5 ++++- test/test-main.c | 35 +++++++++++++++++------------------ 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 7056cfd0180..0ad23e4ba95 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -147,10 +147,13 @@ void spl_board_init(void) if (state->run_unittests) { struct unit_test *tests = UNIT_TEST_ALL_START(); const int count = UNIT_TEST_ALL_COUNT(); + struct unit_test_state uts; int ret;

- ret = ut_run_list("spl", NULL, tests, count, + ut_init_state(&uts); + ret = ut_run_list(&uts, "spl", NULL, tests, count, state->select_unittests, 1, false, NULL); + ut_uninit_state(&uts); /* continue execution into U-Boot */ } } diff --git a/include/test/ut.h b/include/test/ut.h index 2e4d8edf826..a51defc3b90 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -479,12 +479,34 @@ struct unit_test_state *ut_get_state(void); */ void ut_set_state(struct unit_test_state *uts);

+/** + * ut_init_state() - Set up a new test state + * + * This must be called before using the test state with ut_run_tests() + * + * @uts: Test state to init + */ +void ut_init_state(struct unit_test_state *uts); + +/** + * ut_uninit_state() - Free memory used by test state + * + * This must be called before after the test state with ut_run_tests(). To later + * reuse the test state to run more tests, call test_state_init() first + * + * @uts: Test state to uninit + */ +void ut_uninit_state(struct unit_test_state *uts); + /** * ut_run_tests() - Run a set of tests * * This runs the test, handling any preparation and clean-up needed. It prints * the name of each test before running it. * + * @uts: Unit-test state, which must be ready for use, i.e. ut_init_state() + * has been called. The caller is responsible for calling + * ut_uninit_state() after this function returns * @category: Category of these tests. This is a string printed at the start to * announce the the number of tests * @prefix: String prefix for the tests. Any tests that have this prefix will be @@ -503,8 +525,9 @@ void ut_set_state(struct unit_test_state *uts); * Pass NULL to disable this * Return: 0 if all tests passed, -1 if any failed */ -int ut_run_list(const char *name, const char *prefix, struct unit_test *tests, - int count, const char *select_name, int runs_per_test, - bool force_run, const char *test_insert); +int ut_run_list(struct unit_test_state *uts, const char *category, + const char *prefix, struct unit_test *tests, int count, + const char *select_name, int runs_per_test, bool force_run, + const char *test_insert);

#endif diff --git a/test/cmd_ut.c b/test/cmd_ut.c index a14dbf4ca5e..69f0230e556 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -21,6 +21,7 @@ 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; const char *test_insert = NULL; int runs_per_text = 1; bool force_run = false; @@ -44,9 +45,11 @@ int cmd_ut_category(const char *name, const char *prefix, argc--; }

- ret = ut_run_list(name, prefix, tests, n_ents, + ut_init_state(&uts); + ret = ut_run_list(&uts, name, prefix, tests, n_ents, cmd_arg1(argc, argv), runs_per_text, force_run, test_insert); + ut_uninit_state(&uts);

return ret ? CMD_RET_FAILURE : 0; } diff --git a/test/test-main.c b/test/test-main.c index 871fc1f22b4..e12c5a95e45 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -673,15 +673,15 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, return uts->fail_count ? -EBADF : 0; }

-int ut_run_list(const char *category, const char *prefix, - struct unit_test *tests, int count, const char *select_name, - int runs_per_test, bool force_run, const char *test_insert) +int ut_run_list(struct unit_test_state *uts, const char *category, + const char *prefix, struct unit_test *tests, int count, + const char *select_name, int runs_per_test, bool force_run, + const char *test_insert) { - struct unit_test_state uts; + ; bool has_dm_tests = false; int ret;

- ut_init_state(&uts); if (!CONFIG_IS_ENABLED(OF_PLATDATA) && ut_list_has_dm_tests(tests, count, prefix, select_name)) { has_dm_tests = true; @@ -699,32 +699,31 @@ int ut_run_list(const char *category, const char *prefix, if (!select_name) printf("Running %d %s tests\n", count, category);

- uts.of_root = gd_of_root(); - uts.runs_per_test = runs_per_test; + uts->of_root = gd_of_root(); + uts->runs_per_test = runs_per_test; if (fdt_action() == FDTCHK_COPY && gd->fdt_blob) { - uts.fdt_size = fdt_totalsize(gd->fdt_blob); - uts.fdt_copy = os_malloc(uts.fdt_size); - if (!uts.fdt_copy) { + uts->fdt_size = fdt_totalsize(gd->fdt_blob); + uts->fdt_copy = os_malloc(uts->fdt_size); + if (!uts->fdt_copy) { printf("Out of memory for device tree copy\n"); return -ENOMEM; } - memcpy(uts.fdt_copy, gd->fdt_blob, uts.fdt_size); + memcpy(uts->fdt_copy, gd->fdt_blob, uts->fdt_size); } - uts.force_run = force_run; - ret = ut_run_tests(&uts, prefix, tests, count, select_name, + uts->force_run = force_run; + ret = ut_run_tests(uts, prefix, tests, count, select_name, test_insert);

/* Best efforts only...ignore errors */ if (has_dm_tests) - dm_test_restore(uts.of_root); + dm_test_restore(uts->of_root);

- if (uts.skip_count) - printf("Skipped: %d, ", uts.skip_count); + if (uts->skip_count) + printf("Skipped: %d, ", uts->skip_count); if (ret == -ENOENT) printf("Test '%s' not found\n", select_name); else - printf("Failures: %d\n", uts.fail_count); - ut_uninit_state(&uts); + printf("Failures: %d\n", uts->fail_count);

return ret; }

A few messages lack a newline so the test output shows the next test-name on the same line. For example:

Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!Test: hush_test_env_dollar: dollar.c

This is confusing, so fix it.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

test/hush/dollar.c | 7 ++++--- test/hush/loop.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/hush/dollar.c b/test/hush/dollar.c index 077dcd62c0e..820110799a2 100644 --- a/test/hush/dollar.c +++ b/test/hush/dollar.c @@ -108,7 +108,7 @@ static int hush_test_simple_dollar(struct unit_test_state *uts) /* Reset local variable. */ ut_assertok(run_command("dollar_foo=", 0)); } else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) { - puts("Beware: this test set local variable dollar_foo and it cannot be unset!"); + puts("Beware: this test set local variable dollar_foo and it cannot be unset!\n"); }

return 0; @@ -140,7 +140,7 @@ static int hush_test_env_dollar(struct unit_test_state *uts) /* Reset local variable. */ ut_assertok(run_command("env_foo=", 0)); } else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) { - puts("Beware: this test set local variable env_foo and it cannot be unset!"); + puts("Beware: this test set local variable env_foo and it cannot be unset!\n"); }

return 0; @@ -206,7 +206,8 @@ static int hush_test_command_dollar(struct unit_test_state *uts) ut_assertok(run_command("dollar_bar=", 0)); ut_assertok(run_command("dollar_quux=", 0)); } else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) { - puts("Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!"); + puts("Beware: this test sets local variable dollar_bar and " + "dollar_quux and they cannot be unset!\n"); }

return 0; diff --git a/test/hush/loop.c b/test/hush/loop.c index a9b6a8edf24..7154b9bc0ae 100644 --- a/test/hush/loop.c +++ b/test/hush/loop.c @@ -25,7 +25,7 @@ static int hush_test_for(struct unit_test_state *uts) /* Reset local variable. */ ut_assertok(run_command("loop_i=", 0)); } else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) { - puts("Beware: this test set local variable loop_i and it cannot be unset!"); + puts("Beware: this test set local variable loop_i and it cannot be unset!\n"); }

return 0; @@ -56,7 +56,7 @@ static int hush_test_while(struct unit_test_state *uts) /* Reset local variable. */ ut_assertok(run_command("loop_foo=", 0)); } else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) { - puts("Beware: this test set local variable loop_foo and it cannot be unset!"); + puts("Beware: this test set local variable loop_foo and it cannot be unset!\n"); }

return 0;

It is helpful to see a list of available suites. At present this is handled by the longhelp for the 'ut' command, but this is not in a format which can be easily parsed by python tests.

Add a -s option to show this. At present it is not possible to show the number of tests in each suite, but future work will address this. For now, show a ?

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

test/cmd_ut.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 69f0230e556..3e78d072b3d 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -153,9 +153,21 @@ static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc, static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + const char *flags; + printf("Test suites: %d\n", (int)ARRAY_SIZE(cmd_ut_sub)); printf("Total tests: %d\n", (int)UNIT_TEST_ALL_COUNT());

+ flags = cmd_arg1(argc, argv); + if (flags && !strcmp("-s", flags)) { + int i; + + puts("\nTests Suite\n"); + puts("----- -----\n"); + for (i = 1; i < ARRAY_SIZE(cmd_ut_sub); i++) + printf("%5s %s\n", "?", cmd_ut_sub[i].name); + } + return 0; }

@@ -186,7 +198,7 @@ U_BOOT_LONGHELP(ut, "\n" "\nOptions for <suite>:" "\nall - execute all enabled tests" - "\ninfo - show info about tests" + "\ninfo [-s] - show info about tests [and suites]" #ifdef CONFIG_CMD_ADDRMAP "\naddrmap - very basic test of addrmap command" #endif

Most test suites have a _test suffix. This is not necessary as there is also a ut_ prefix.

Drop the suffix so that (with future work) the suite name can be used as the linker-list name.

Remove the suffix from the pytest regex as well, moving it to the top of the file, as it is a constant.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/dm/test.h | 2 +- include/test/common.h | 2 +- include/test/env.h | 2 +- include/test/hush.h | 2 +- include/test/lib.h | 2 +- include/test/log.h | 4 ++-- include/test/optee.h | 2 +- include/test/overlay.h | 2 +- test/boot/bootm.c | 6 +++--- test/boot/bootstd_common.c | 8 ++++---- test/boot/bootstd_common.h | 3 +-- test/boot/measurement.c | 6 +++--- test/boot/upl.c | 6 +++--- test/cmd/addrmap.c | 6 +++--- test/cmd/bdinfo.c | 6 +++--- test/cmd/exit.c | 6 +++--- test/cmd/fdt.c | 6 +++--- test/cmd/font.c | 6 +++--- test/cmd/loadm.c | 6 +++--- test/cmd/mbr.c | 6 +++--- test/cmd/mem.c | 4 ++-- test/cmd/mem_copy.c | 2 +- test/cmd/mem_search.c | 2 +- test/cmd/pci_mps.c | 6 +++--- test/cmd/seama.c | 6 +++--- test/cmd/setexpr.c | 6 +++--- test/common/bloblist.c | 6 +++--- test/common/cmd_ut_common.c | 4 ++-- test/dm/test-dm.c | 4 ++-- test/env/cmd_ut_env.c | 4 ++-- test/hush/cmd_ut_hush.c | 4 ++-- test/lib/cmd_ut_lib.c | 4 ++-- test/log/log_ut.c | 4 ++-- test/optee/cmd_ut_optee.c | 4 ++-- test/overlay/cmd_ut_overlay.c | 4 ++-- test/py/conftest.py | 7 +++++-- 36 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/include/dm/test.h b/include/dm/test.h index 3cbf2c740d4..4aabb4603b9 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -143,7 +143,7 @@ extern struct unit_test_state global_dm_test_state;

/* Declare a new driver model test */ #define DM_TEST(_name, _flags) \ - UNIT_TEST(_name, UTF_DM | UTF_CONSOLE | (_flags), dm_test) + UNIT_TEST(_name, UTF_DM | UTF_CONSOLE | (_flags), dm)

/* * struct sandbox_sdl_plat - Platform data for the SDL video driver diff --git a/include/test/common.h b/include/test/common.h index 81260d06ad6..d5a65d5b50b 100644 --- a/include/test/common.h +++ b/include/test/common.h @@ -10,6 +10,6 @@ #include <test/test.h>

/* Declare a new common function test */ -#define COMMON_TEST(_name, _flags) UNIT_TEST(_name, _flags, common_test) +#define COMMON_TEST(_name, _flags) UNIT_TEST(_name, _flags, common)

#endif /* __TEST_COMMON_H__ */ diff --git a/include/test/env.h b/include/test/env.h index f45e33d71a4..6a63cc972e9 100644 --- a/include/test/env.h +++ b/include/test/env.h @@ -10,6 +10,6 @@ #include <test/test.h>

/* Declare a new environment test */ -#define ENV_TEST(_name, _flags) UNIT_TEST(_name, _flags, env_test) +#define ENV_TEST(_name, _flags) UNIT_TEST(_name, _flags, env)

#endif /* __TEST_ENV_H__ */ diff --git a/include/test/hush.h b/include/test/hush.h index cca66544a06..e57bf13ea61 100644 --- a/include/test/hush.h +++ b/include/test/hush.h @@ -10,6 +10,6 @@ #include <test/test.h>

/* Declare a new environment test */ -#define HUSH_TEST(_name, _flags) UNIT_TEST(_name, _flags, hush_test) +#define HUSH_TEST(_name, _flags) UNIT_TEST(_name, _flags, hush)

#endif /* __TEST_HUSH_H__ */ diff --git a/include/test/lib.h b/include/test/lib.h index 04b6241e54a..b19eb863a33 100644 --- a/include/test/lib.h +++ b/include/test/lib.h @@ -9,6 +9,6 @@ #include <test/test.h>

/* Declare a new library function test */ -#define LIB_TEST(_name, _flags) UNIT_TEST(_name, _flags, lib_test) +#define LIB_TEST(_name, _flags) UNIT_TEST(_name, _flags, lib)

#endif /* __TEST_LIB_H__ */ diff --git a/include/test/log.h b/include/test/log.h index e3362b85e99..0921c0c1cbc 100644 --- a/include/test/log.h +++ b/include/test/log.h @@ -13,8 +13,8 @@ #define LOGF_TEST (BIT(LOGF_FUNC) | BIT(LOGF_MSG))

/* Declare a new logging test */ -#define LOG_TEST(_name) UNIT_TEST(_name, UTF_CONSOLE, log_test) +#define LOG_TEST(_name) UNIT_TEST(_name, UTF_CONSOLE, log) #define LOG_TEST_FLAGS(_name, _flags) \ - UNIT_TEST(_name, _flags | UTF_CONSOLE, log_test) + UNIT_TEST(_name, _flags | UTF_CONSOLE, log)

#endif /* __TEST_LOG_H__ */ diff --git a/include/test/optee.h b/include/test/optee.h index a8c6e6395f5..f4255b39ee3 100644 --- a/include/test/optee.h +++ b/include/test/optee.h @@ -9,6 +9,6 @@ #include <test/test.h>

/* Declare a new environment test */ -#define OPTEE_TEST(_name, _flags) UNIT_TEST(_name, _flags, optee_test) +#define OPTEE_TEST(_name, _flags) UNIT_TEST(_name, _flags, optee)

#endif /* __TEST_OPTEE_H__ */ diff --git a/include/test/overlay.h b/include/test/overlay.h index c13f4d66e09..5dc98399ce7 100644 --- a/include/test/overlay.h +++ b/include/test/overlay.h @@ -10,6 +10,6 @@ #include <test/test.h>

/* Declare a new environment test */ -#define OVERLAY_TEST(_name, _flags) UNIT_TEST(_name, _flags, overlay_test) +#define OVERLAY_TEST(_name, _flags) UNIT_TEST(_name, _flags, overlay)

#endif /* __TEST_OVERLAY_H__ */ diff --git a/test/boot/bootm.c b/test/boot/bootm.c index 0dd8bc2979f..c8e32023acb 100644 --- a/test/boot/bootm.c +++ b/test/boot/bootm.c @@ -13,7 +13,7 @@

DECLARE_GLOBAL_DATA_PTR;

-#define BOOTM_TEST(_name, _flags) UNIT_TEST(_name, _flags, bootm_test) +#define BOOTM_TEST(_name, _flags) UNIT_TEST(_name, _flags, bootm)

enum { BUF_SIZE = 1024, @@ -259,8 +259,8 @@ BOOTM_TEST(bootm_test_subst_both, 0);

int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(bootm_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(bootm_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(bootm); + const int n_ents = UNIT_TEST_SUITE_COUNT(bootm);

return cmd_ut_category("bootm", "bootm_test_", tests, n_ents, argc, argv); diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c index ff8ed2303b3..6bd9bb65a40 100644 --- a/test/boot/bootstd_common.c +++ b/test/boot/bootstd_common.c @@ -96,8 +96,8 @@ void bootstd_reset_usb(void)

int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(bootstd_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(bootstd_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(bootstd); + const int n_ents = UNIT_TEST_SUITE_COUNT(bootstd); int ret;

ret = bootstd_setup_for_tests(); @@ -106,6 +106,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_FAILURE; }

- return cmd_ut_category("bootstd", "bootstd_test_", - tests, n_ents, argc, argv); + return cmd_ut_category("bootstd", "bootstd_", tests, n_ents, + argc, argv); } diff --git a/test/boot/bootstd_common.h b/test/boot/bootstd_common.h index e29036c897c..ea3ecd1166c 100644 --- a/test/boot/bootstd_common.h +++ b/test/boot/bootstd_common.h @@ -12,8 +12,7 @@ #include <version_string.h>

/* Declare a new bootdev test */ -#define BOOTSTD_TEST(_name, _flags) \ - UNIT_TEST(_name, _flags, bootstd_test) +#define BOOTSTD_TEST(_name, _flags) UNIT_TEST(_name, _flags, bootstd)

#define NVDATA_START_BLK ((0x400 + 0x400) / MMC_MAX_BLOCK_LEN) #define VERSION_START_BLK ((0x400 + 0x800) / MMC_MAX_BLOCK_LEN) diff --git a/test/boot/measurement.c b/test/boot/measurement.c index 29be495412d..018e8af45f0 100644 --- a/test/boot/measurement.c +++ b/test/boot/measurement.c @@ -14,7 +14,7 @@ #include <asm/io.h>

#define MEASUREMENT_TEST(_name, _flags) \ - UNIT_TEST(_name, _flags, measurement_test) + UNIT_TEST(_name, _flags, measurement)

static int measure(struct unit_test_state *uts) { @@ -57,8 +57,8 @@ MEASUREMENT_TEST(measure, 0); int do_ut_measurement(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(measurement_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(measurement_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(measurement); + const int n_ents = UNIT_TEST_SUITE_COUNT(measurement);

return cmd_ut_category("measurement", "measurement_test_", tests, n_ents, argc, argv); diff --git a/test/boot/upl.c b/test/boot/upl.c index ef65cf34055..2c9b8bc8bc0 100644 --- a/test/boot/upl.c +++ b/test/boot/upl.c @@ -16,7 +16,7 @@ #include "bootstd_common.h"

/* Declare a new upl test */ -#define UPL_TEST(_name, _flags) UNIT_TEST(_name, _flags, upl_test) +#define UPL_TEST(_name, _flags) UNIT_TEST(_name, _flags, upl)

static int add_region(struct unit_test_state *uts, struct alist *lst, ulong base, ulong size) @@ -429,8 +429,8 @@ UPL_TEST(upl_test_info_norun, UTF_CONSOLE | UTF_MANUAL);

int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(upl_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(upl_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(upl); + const int n_ents = UNIT_TEST_SUITE_COUNT(upl);

return cmd_ut_category("upl", "cmd_upl_", tests, n_ents, argc, argv); } diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c index 43897615aa9..fd0117102e2 100644 --- a/test/cmd/addrmap.c +++ b/test/cmd/addrmap.c @@ -10,7 +10,7 @@ #include <test/ut.h>

/* Declare a new addrmap test */ -#define ADDRMAP_TEST(_name, _flags) UNIT_TEST(_name, _flags, addrmap_test) +#define ADDRMAP_TEST(_name, _flags) UNIT_TEST(_name, _flags, addrmap)

/* Test 'addrmap' command output */ static int addrmap_test_basic(struct unit_test_state *uts) @@ -27,8 +27,8 @@ ADDRMAP_TEST(addrmap_test_basic, UTF_CONSOLE);

int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(addrmap_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(addrmap_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(addrmap); + const int n_ents = UNIT_TEST_SUITE_COUNT(addrmap);

return cmd_ut_category("addrmap", "cmd_addrmap_", tests, n_ents, argc, argv); diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index bb419ab2394..46482b1f56b 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* Declare a new bdinfo test */ -#define BDINFO_TEST(_name, _flags) UNIT_TEST(_name, _flags, bdinfo_test) +#define BDINFO_TEST(_name, _flags) UNIT_TEST(_name, _flags, bdinfo)

static int test_num_l(struct unit_test_state *uts, const char *name, ulong value) @@ -285,8 +285,8 @@ BDINFO_TEST(bdinfo_test_eth, UTF_CONSOLE);

int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(bdinfo_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo); + const int n_ents = UNIT_TEST_SUITE_COUNT(bdinfo);

return cmd_ut_category("bdinfo", "bdinfo_test_", tests, n_ents, argc, argv); } diff --git a/test/cmd/exit.c b/test/cmd/exit.c index cf65c05e283..d1eacdc36c2 100644 --- a/test/cmd/exit.c +++ b/test/cmd/exit.c @@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* Declare a new exit test */ -#define EXIT_TEST(_name, _flags) UNIT_TEST(_name, _flags, exit_test) +#define EXIT_TEST(_name, _flags) UNIT_TEST(_name, _flags, exit)

/* Test 'exit addr' getting/setting address */ static int cmd_exit_test(struct unit_test_state *uts) @@ -113,8 +113,8 @@ EXIT_TEST(cmd_exit_test, UTF_CONSOLE);

int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(exit_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(exit_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(exit); + const int n_ents = UNIT_TEST_SUITE_COUNT(exit);

return cmd_ut_category("exit", "exit_test_", tests, n_ents, argc, argv); diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c index e64785101cd..74fd603bb02 100644 --- a/test/cmd/fdt.c +++ b/test/cmd/fdt.c @@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR; */

/* Declare a new fdt test */ -#define FDT_TEST(_name, _flags) UNIT_TEST(_name, _flags, fdt_test) +#define FDT_TEST(_name, _flags) UNIT_TEST(_name, _flags, fdt)

/** * make_test_fdt() - Create an FDT with just a root node @@ -1465,8 +1465,8 @@ FDT_TEST(fdt_test_apply, UTF_CONSOLE);

int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(fdt_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(fdt_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(fdt); + const int n_ents = UNIT_TEST_SUITE_COUNT(fdt);

return cmd_ut_category("fdt", "fdt_test_", tests, n_ents, argc, argv); } diff --git a/test/cmd/font.c b/test/cmd/font.c index 3335dd65bea..d860efe8ce5 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -12,7 +12,7 @@ #include <test/ut.h>

/* Declare a new fdt test */ -#define FONT_TEST(_name, _flags) UNIT_TEST(_name, _flags, font_test) +#define FONT_TEST(_name, _flags) UNIT_TEST(_name, _flags, font)

/* Test 'fdt addr' resizing an fdt */ static int font_test_base(struct unit_test_state *uts) @@ -88,8 +88,8 @@ FONT_TEST(font_test_base, UTF_SCAN_PDATA | UTF_SCAN_FDT | UTF_CONSOLE |

int do_ut_font(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(font_Test); - const int n_ents = UNIT_TEST_SUITE_COUNT(font_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(font); + const int n_ents = UNIT_TEST_SUITE_COUNT(font);

return cmd_ut_category("font", "font_test_", tests, n_ents, argc, argv); } diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c index dedb4f7683e..78bb12ce88c 100644 --- a/test/cmd/loadm.c +++ b/test/cmd/loadm.c @@ -19,7 +19,7 @@

#define BUF_SIZE 0x100

-#define LOADM_TEST(_name, _flags) UNIT_TEST(_name, _flags, loadm_test) +#define LOADM_TEST(_name, _flags) UNIT_TEST(_name, _flags, loadm)

static int loadm_test_params(struct unit_test_state *uts) { @@ -61,8 +61,8 @@ LOADM_TEST(loadm_test_load, UTF_CONSOLE);

int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(loadm_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(loadm_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(loadm); + const int n_ents = UNIT_TEST_SUITE_COUNT(loadm);

return cmd_ut_category("loadm", "loadm_test_", tests, n_ents, argc, argv); diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c index d137378a3be..ad859921ce5 100644 --- a/test/cmd/mbr.c +++ b/test/cmd/mbr.c @@ -470,12 +470,12 @@ static int mbr_test_run(struct unit_test_state *uts) }

/* Declare mbr test */ -UNIT_TEST(mbr_test_run, UTF_CONSOLE, mbr_test); +UNIT_TEST(mbr_test_run, UTF_CONSOLE, mbr);

int do_ut_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(mbr_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(mbr_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(mbr); + const int n_ents = UNIT_TEST_SUITE_COUNT(mbr);

return cmd_ut_category("mbr", "mbr_test_", tests, n_ents, argc, argv); } diff --git a/test/cmd/mem.c b/test/cmd/mem.c index d6f2544a4e9..2b78e421a9c 100644 --- a/test/cmd/mem.c +++ b/test/cmd/mem.c @@ -11,8 +11,8 @@

int do_ut_mem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(mem_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(mem_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(mem); + const int n_ents = UNIT_TEST_SUITE_COUNT(mem);

return cmd_ut_category("mem", "mem_test_", tests, n_ents, argc, argv); diff --git a/test/cmd/mem_copy.c b/test/cmd/mem_copy.c index 67eca328777..3e904fc4e4b 100644 --- a/test/cmd/mem_copy.c +++ b/test/cmd/mem_copy.c @@ -12,7 +12,7 @@ #define BUF_SIZE 256

/* Declare a new mem test */ -#define MEM_TEST(_name) UNIT_TEST(_name, 0, mem_test) +#define MEM_TEST(_name) UNIT_TEST(_name, 0, mem)

struct param { int d, s, count; diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c index 3a031eed7ed..df8938bdb6c 100644 --- a/test/cmd/mem_search.c +++ b/test/cmd/mem_search.c @@ -14,7 +14,7 @@ #define BUF_SIZE 0x100

/* Declare a new mem test */ -#define MEM_TEST(_name, _flags) UNIT_TEST(_name, _flags, mem_test) +#define MEM_TEST(_name, _flags) UNIT_TEST(_name, _flags, mem)

/* Test 'ms' command with bytes */ static int mem_test_ms_b(struct unit_test_state *uts) diff --git a/test/cmd/pci_mps.c b/test/cmd/pci_mps.c index 0c57d15d636..2595ea103ff 100644 --- a/test/cmd/pci_mps.c +++ b/test/cmd/pci_mps.c @@ -11,7 +11,7 @@ #include <test/suites.h> #include <test/ut.h>

-#define PCI_MPS_TEST(_name, _flags) UNIT_TEST(_name, _flags, pci_mps_test) +#define PCI_MPS_TEST(_name, _flags) UNIT_TEST(_name, _flags, pci_mps)

/* Test "pci_mps" command in safe "s" mode */ static int test_pci_mps_safe(struct unit_test_state *uts) @@ -32,8 +32,8 @@ PCI_MPS_TEST(test_pci_mps_safe, UTF_CONSOLE); int do_ut_pci_mps(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(pci_mps_test); - const int n = UNIT_TEST_SUITE_COUNT(pci_mps_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(pci_mps); + const int n = UNIT_TEST_SUITE_COUNT(pci_mps);

return cmd_ut_category("pci_mps", "pci_mps_test_", tests, n, argc, argv); diff --git a/test/cmd/seama.c b/test/cmd/seama.c index 28d6b9ab517..39590d162ac 100644 --- a/test/cmd/seama.c +++ b/test/cmd/seama.c @@ -11,7 +11,7 @@ #include <test/test.h> #include <test/ut.h>

-#define SEAMA_TEST(_name, _flags) UNIT_TEST(_name, _flags, seama_test) +#define SEAMA_TEST(_name, _flags) UNIT_TEST(_name, _flags, seama)

static int seama_test_noargs(struct unit_test_state *uts) { @@ -59,8 +59,8 @@ SEAMA_TEST(seama_test_index, UTF_CONSOLE);

int do_ut_seama(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(seama_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(seama_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(seama); + const int n_ents = UNIT_TEST_SUITE_COUNT(seama);

return cmd_ut_category("seama", "seama_test_", tests, n_ents, argc, argv); diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index 9b3277f2ad9..49eac5890aa 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -15,7 +15,7 @@ #define BUF_SIZE 0x100

/* Declare a new setexpr test */ -#define SETEXPR_TEST(_name, _flags) UNIT_TEST(_name, _flags, setexpr_test) +#define SETEXPR_TEST(_name, _flags) UNIT_TEST(_name, _flags, setexpr)

/* Test 'setexpr' command with simply setting integers */ static int setexpr_test_int(struct unit_test_state *uts) @@ -482,8 +482,8 @@ SETEXPR_TEST(setexpr_test_fmt, UTF_CONSOLE);

int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(setexpr_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(setexpr_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(setexpr); + const int n_ents = UNIT_TEST_SUITE_COUNT(setexpr);

return cmd_ut_category("setexpr", "setexpr_test_", tests, n_ents, argc, argv); diff --git a/test/common/bloblist.c b/test/common/bloblist.c index 4bca62110a5..f5d98774862 100644 --- a/test/common/bloblist.c +++ b/test/common/bloblist.c @@ -12,7 +12,7 @@

/* Declare a new bloblist test */ #define BLOBLIST_TEST(_name, _flags) \ - UNIT_TEST(_name, _flags, bloblist_test) + UNIT_TEST(_name, _flags, bloblist)

enum { TEST_TAG = BLOBLISTT_U_BOOT_SPL_HANDOFF, @@ -606,8 +606,8 @@ BLOBLIST_TEST(bloblist_test_blob_maxsize, UFT_BLOBLIST); int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(bloblist_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(bloblist_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(bloblist); + const int n_ents = UNIT_TEST_SUITE_COUNT(bloblist);

return cmd_ut_category("bloblist", "bloblist_test_", tests, n_ents, argc, argv); diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c index 2f03a58af47..0724c9361b8 100644 --- a/test/common/cmd_ut_common.c +++ b/test/common/cmd_ut_common.c @@ -13,8 +13,8 @@

int do_ut_common(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(common_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(common_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(common); + const int n_ents = UNIT_TEST_SUITE_COUNT(common);

return cmd_ut_category("common", "common_test_", tests, n_ents, argc, argv); diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index 7cfbefe02da..8f83110163a 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -8,8 +8,8 @@

int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(dm_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(dm_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(dm); + const int n_ents = UNIT_TEST_SUITE_COUNT(dm);

return cmd_ut_category("dm", "dm_test_", tests, n_ents, argc, argv); } diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index 494b5db395b..332139bb803 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -77,8 +77,8 @@ ENV_TEST(env_test_env_cmd, UTF_CONSOLE);

int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(env_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(env_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(env); + const int n_ents = UNIT_TEST_SUITE_COUNT(env);

return cmd_ut_category("env", "env_test_", tests, n_ents, argc, argv); } diff --git a/test/hush/cmd_ut_hush.c b/test/hush/cmd_ut_hush.c index abad44f3216..141203d766b 100644 --- a/test/hush/cmd_ut_hush.c +++ b/test/hush/cmd_ut_hush.c @@ -11,8 +11,8 @@

int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(hush_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(hush_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(hush); + const int n_ents = UNIT_TEST_SUITE_COUNT(hush);

return cmd_ut_category("hush", "hush_test_", tests, n_ents, argc, argv); diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c index f98cb9b3c57..90a8c0728b7 100644 --- a/test/lib/cmd_ut_lib.c +++ b/test/lib/cmd_ut_lib.c @@ -12,8 +12,8 @@

int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(lib_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(lib_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(lib); + const int n_ents = UNIT_TEST_SUITE_COUNT(lib);

return cmd_ut_category("lib", "lib_test_", tests, n_ents, argc, argv); } diff --git a/test/log/log_ut.c b/test/log/log_ut.c index 6617ed8b152..2aa3afe286a 100644 --- a/test/log/log_ut.c +++ b/test/log/log_ut.c @@ -12,8 +12,8 @@

int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(log_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(log_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(log); + const int n_ents = UNIT_TEST_SUITE_COUNT(log);

return cmd_ut_category("log", "log_test_", tests, n_ents, argc, argv); diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index c6f50e0995a..fc6674764f9 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -93,8 +93,8 @@ OPTEE_TEST(optee_fdt_protected_memory, 0);

int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(optee_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(optee_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(optee); + const int n_ents = UNIT_TEST_SUITE_COUNT(optee); struct unit_test_state *uts; void *fdt_optee = &__dtb_test_optee_optee_begin; void *fdt_no_optee = &__dtb_test_optee_no_optee_begin; diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index 256afd115d2..e0483afc31d 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -212,8 +212,8 @@ OVERLAY_TEST(fdt_overlay_stacked, 0);

int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct unit_test *tests = UNIT_TEST_SUITE_START(overlay_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(overlay_test); + struct unit_test *tests = UNIT_TEST_SUITE_START(overlay); + const int n_ents = UNIT_TEST_SUITE_COUNT(overlay); struct unit_test_state *uts; void *fdt_base = &__dtb_test_fdt_base_begin; void *fdt_overlay = &__dtbo_test_fdt_overlay_begin; diff --git a/test/py/conftest.py b/test/py/conftest.py index d4127dd0a93..3bd333bfd24 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -33,6 +33,9 @@ console = None

TEST_PY_DIR = os.path.dirname(os.path.abspath(__file__))

+# Regex for test-function symbols +RE_UT_TEST_LIST = re.compile(r'[^a-zA-Z0-9_]_u_boot_list_2_ut_(.*)_2_(.*)\s*$') + def mkdir_p(path): """Create a directory path.

@@ -341,7 +344,7 @@ def pytest_configure(config): import u_boot_console_exec_attach console = u_boot_console_exec_attach.ConsoleExecAttach(log, ubconfig)

-re_ut_test_list = re.compile(r'[^a-zA-Z0-9_]_u_boot_list_2_ut_(.*)_test_2_(.*)\s*$') + def generate_ut_subtest(metafunc, fixture_name, sym_path): """Provide parametrization for a ut_subtest fixture.

@@ -368,7 +371,7 @@ def generate_ut_subtest(metafunc, fixture_name, sym_path):

vals = [] for l in lines: - m = re_ut_test_list.search(l) + m = RE_UT_TEST_LIST.search(l) if not m: continue suite, name = m.groups()

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd/bdinfo.c | 8 -------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index c1119e44999..b6af9295424 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -32,7 +32,6 @@ int cmd_ut_category(const char *name, const char *prefix,

int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 46482b1f56b..11f717bf43e 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -282,11 +282,3 @@ static int bdinfo_test_eth(struct unit_test_state *uts) return 0; } BDINFO_TEST(bdinfo_test_eth, UTF_CONSOLE); - -int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo); - const int n_ents = UNIT_TEST_SUITE_COUNT(bdinfo); - - return cmd_ut_category("bdinfo", "bdinfo_test_", tests, n_ents, argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index c5df8b397b3..bbd329912d4 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -123,7 +123,7 @@ SUITE_DECL(upl); static struct suite suites[] = { SUITE_CMD(info, do_ut_info), #ifdef CONFIG_CMD_BDI - SUITE_CMD(bdinfo, do_ut_bdinfo), + SUITE(bdinfo), #endif #ifdef CONFIG_UT_BOOTSTD SUITE_CMD(bootstd, do_ut_bootstd),

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd_ut.c | 2 +- test/common/Makefile | 1 - test/common/cmd_ut_common.c | 21 --------------------- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 test/common/cmd_ut_common.c

diff --git a/include/test/suites.h b/include/test/suites.h index 21158692e9b..d6c0061ff87 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -37,7 +37,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_common(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 09538301cd7..1fda67abd95 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -131,7 +131,7 @@ static struct suite suites[] = { #ifdef CONFIG_CMDLINE SUITE(cmd), #endif - SUITE_CMD(common, do_ut_common), + SUITE(common), #if defined(CONFIG_UT_DM) SUITE_CMD(dm, do_ut_dm), #endif diff --git a/test/common/Makefile b/test/common/Makefile index 53c4f16164d..9cfb5585d78 100644 --- a/test/common/Makefile +++ b/test/common/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-y += cmd_ut_common.o obj-$(CONFIG_AUTOBOOT) += test_autoboot.o ifneq ($(CONFIG_$(XPL_)BLOBLIST),) obj-$(CONFIG_$(XPL_)CMDLINE) += bloblist.o diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c deleted file mode 100644 index 0724c9361b8..00000000000 --- a/test/common/cmd_ut_common.c +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2019 Heinrich Schuchardt xypron.glpk@gmx.de - * Copyright (c) 2021 Steffen Jaeckel jaeckel-floss@eyet-services.de - * - * Unit tests for common functions - */ - -#include <command.h> -#include <test/common.h> -#include <test/suites.h> -#include <test/ut.h> - -int do_ut_common(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(common); - const int n_ents = UNIT_TEST_SUITE_COUNT(common); - - return cmd_ut_category("common", "common_test_", tests, n_ents, argc, - argv); -}

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd_ut.c | 2 +- test/env/cmd_ut_env.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 414613c593e..b78436fe2b2 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -37,7 +37,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_font(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index a0905ec54b7..155b187ad4b 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -136,7 +136,7 @@ static struct suite suites[] = { SUITE(dm), #endif #if defined(CONFIG_UT_ENV) - SUITE_CMD(env, do_ut_env), + SUITE(env), #endif SUITE_CMD(exit, do_ut_exit), #ifdef CONFIG_CMD_FDT diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index 332139bb803..81d1bb2f80d 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -4,7 +4,6 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */

-#include <command.h> #include <test/env.h> #include <test/suites.h> #include <test/ut.h> @@ -74,11 +73,3 @@ static int env_test_env_cmd(struct unit_test_state *uts) return 0; } ENV_TEST(env_test_env_cmd, UTF_CONSOLE); - -int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(env); - const int n_ents = UNIT_TEST_SUITE_COUNT(env); - - return cmd_ut_category("env", "env_test_", tests, n_ents, argc, argv); -}

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd/fdt.c | 8 -------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 70b9af1fd05..bf3a9851322 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -37,7 +37,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_font(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c index 74fd603bb02..ab6dbd45e54 100644 --- a/test/cmd/fdt.c +++ b/test/cmd/fdt.c @@ -1462,11 +1462,3 @@ static int fdt_test_apply(struct unit_test_state *uts) return 0; } FDT_TEST(fdt_test_apply, UTF_CONSOLE); - -int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(fdt); - const int n_ents = UNIT_TEST_SUITE_COUNT(fdt); - - return cmd_ut_category("fdt", "fdt_test_", tests, n_ents, argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 387aacb916b..0babc91d118 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -140,7 +140,7 @@ static struct suite suites[] = { #endif SUITE(exit), #ifdef CONFIG_CMD_FDT - SUITE_CMD(fdt, do_ut_fdt), + SUITE(fdt), #endif #ifdef CONFIG_CONSOLE_TRUETYPE SUITE_CMD(font, do_ut_font),

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd_ut.c | 2 +- test/lib/Makefile | 1 - test/lib/cmd_ut_lib.c | 19 ------------------- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 test/lib/cmd_ut_lib.c

diff --git a/include/test/suites.h b/include/test/suites.h index 587d6a5b473..08b35b276be 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -38,7 +38,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); int do_ut_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index db96a4ac2ac..27d090c7225 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -152,7 +152,7 @@ static struct suite suites[] = { SUITE_CMD(overlay, do_ut_overlay), #endif #ifdef CONFIG_UT_LIB - SUITE_CMD(lib, do_ut_lib), + SUITE(lib), #endif #ifdef CONFIG_UT_LOG SUITE_CMD(log, do_ut_log), diff --git a/test/lib/Makefile b/test/lib/Makefile index 3556c4d199c..f38f4947157 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -6,7 +6,6 @@ obj-$(CONFIG_$(XPL_)UT_COMPRESSION) += compression.o

ifeq ($(CONFIG_XPL_BUILD),) -obj-y += cmd_ut_lib.o obj-y += abuf.o obj-y += alist.o obj-$(CONFIG_EFI_LOADER) += efi_device_path.o diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c deleted file mode 100644 index 90a8c0728b7..00000000000 --- a/test/lib/cmd_ut_lib.c +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2019 Heinrich Schuchardt xypron.glpk@gmx.de - * - * Unit tests for library functions - */ - -#include <command.h> -#include <test/lib.h> -#include <test/suites.h> -#include <test/ut.h> - -int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(lib); - const int n_ents = UNIT_TEST_SUITE_COUNT(lib); - - return cmd_ut_category("lib", "lib_test_", tests, n_ents, argc, argv); -}

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd/mbr.c | 8 -------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 72f98eb3558..612167fe053 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -39,7 +39,6 @@ int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_measurement(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); int do_ut_mem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c index ad859921ce5..45bab04923a 100644 --- a/test/cmd/mbr.c +++ b/test/cmd/mbr.c @@ -471,11 +471,3 @@ static int mbr_test_run(struct unit_test_state *uts)

/* Declare mbr test */ UNIT_TEST(mbr_test_run, UTF_CONSOLE, mbr); - -int do_ut_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(mbr); - const int n_ents = UNIT_TEST_SUITE_COUNT(mbr); - - return cmd_ut_category("mbr", "mbr_test_", tests, n_ents, argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index a196702dd17..1a69b1c215b 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -159,7 +159,7 @@ static struct suite suites[] = { #endif #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_MBR) && defined(CONFIG_CMD_MMC) \ && defined(CONFIG_MMC_SANDBOX) && defined(CONFIG_MMC_WRITE) - SUITE_CMD(mbr, do_ut_mbr), + SUITE(mbr), #endif SUITE_CMD(mem, do_ut_mem), #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR)

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 2 -- test/cmd/setexpr.c | 9 --------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index cb6b6fba240..775b0a5a131 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -46,8 +46,6 @@ int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_pci_mps(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_seama(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]); int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

#endif /* __TEST_SUITES_H__ */ diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index 49eac5890aa..7f318a42ead 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -479,12 +479,3 @@ static int setexpr_test_fmt(struct unit_test_state *uts) } SETEXPR_TEST(setexpr_test_fmt, UTF_CONSOLE); #endif - -int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(setexpr); - const int n_ents = UNIT_TEST_SUITE_COUNT(setexpr); - - return cmd_ut_category("setexpr", "setexpr_test_", tests, n_ents, - argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 8ab29046969..f2a72adc16e 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -163,7 +163,7 @@ static struct suite suites[] = { #endif SUITE(mem), #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR) - SUITE_CMD(setexpr, do_ut_setexpr), + SUITE(setexpr), #endif #ifdef CONFIG_MEASURED_BOOT SUITE_CMD(measurement, do_ut_measurement),

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 2 -- test/cmd_ut.c | 2 +- test/common/bloblist.c | 10 ---------- 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 1a40af6599a..32b7e8e3d5a 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -35,8 +35,6 @@ int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]); int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index ff9976cb98a..93bcc5efc74 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -170,7 +170,7 @@ static struct suite suites[] = { #endif #ifdef CONFIG_SANDBOX #if CONFIG_IS_ENABLED(BLOBLIST) - SUITE_CMD(bloblist, do_ut_bloblist), + SUITE(bloblist), SUITE_CMD(bootm, do_ut_bootm), #endif #endif diff --git a/test/common/bloblist.c b/test/common/bloblist.c index f5d98774862..9467abfa8e1 100644 --- a/test/common/bloblist.c +++ b/test/common/bloblist.c @@ -602,13 +602,3 @@ static int bloblist_test_blob_maxsize(struct unit_test_state *uts) return 0; } BLOBLIST_TEST(bloblist_test_blob_maxsize, UFT_BLOBLIST); - -int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(bloblist); - const int n_ents = UNIT_TEST_SUITE_COUNT(bloblist); - - return cmd_ut_category("bloblist", "bloblist_test_", - tests, n_ents, argc, argv); -}

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 2 -- test/cmd/addrmap.c | 9 --------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 77af692be3c..54fddaa6bac 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -30,8 +30,6 @@ int cmd_ut_category(const char *name, const char *prefix, struct unit_test *tests, int n_ents, int argc, char *const argv[]);

-int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]); int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c index fd0117102e2..1f2deb15052 100644 --- a/test/cmd/addrmap.c +++ b/test/cmd/addrmap.c @@ -24,12 +24,3 @@ static int addrmap_test_basic(struct unit_test_state *uts) return 0; } ADDRMAP_TEST(addrmap_test_basic, UTF_CONSOLE); - -int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(addrmap); - const int n_ents = UNIT_TEST_SUITE_COUNT(addrmap); - - return cmd_ut_category("addrmap", "cmd_addrmap_", tests, n_ents, - argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 71283d6dd14..611171740a9 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -175,7 +175,7 @@ static struct suite suites[] = { #endif #endif #ifdef CONFIG_CMD_ADDRMAP - SUITE_CMD(addrmap, do_ut_addrmap), + SUITE(addrmap), #endif #if CONFIG_IS_ENABLED(HUSH_PARSER) SUITE_CMD(hush, do_ut_hush),

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd/loadm.c | 9 --------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index b96a78f7129..f6b33da5a28 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -32,7 +32,6 @@ int cmd_ut_category(const char *name, const char *prefix,

int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c index 78bb12ce88c..3c623aa655f 100644 --- a/test/cmd/loadm.c +++ b/test/cmd/loadm.c @@ -58,12 +58,3 @@ static int loadm_test_load (struct unit_test_state *uts) return 0; } LOADM_TEST(loadm_test_load, UTF_CONSOLE); - -int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(loadm); - const int n_ents = UNIT_TEST_SUITE_COUNT(loadm); - - return cmd_ut_category("loadm", "loadm_test_", tests, n_ents, argc, - argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index c892891d6c8..3620be62ce6 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -181,7 +181,7 @@ static struct suite suites[] = { SUITE(hush), #endif #ifdef CONFIG_CMD_LOADM - SUITE_CMD(loadm, do_ut_loadm), + SUITE(loadm), #endif #ifdef CONFIG_CMD_PCI_MPS SUITE_CMD(pci_mps, do_ut_pci_mps),

Use the new suite-runner to run these tests instead.

It is not clear that these actually work, since they are not enabled on sandbox for some reason.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/cmd/seama.c | 9 --------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index 49c18ebf456..cd758b8c464 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -35,7 +35,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_seama(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

#endif /* __TEST_SUITES_H__ */ diff --git a/test/cmd/seama.c b/test/cmd/seama.c index 39590d162ac..1edc3fcac5a 100644 --- a/test/cmd/seama.c +++ b/test/cmd/seama.c @@ -56,12 +56,3 @@ static int seama_test_index(struct unit_test_state *uts) return 0; } SEAMA_TEST(seama_test_index, UTF_CONSOLE); - -int do_ut_seama(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(seama); - const int n_ents = UNIT_TEST_SUITE_COUNT(seama); - - return cmd_ut_category("seama", "seama_test_", tests, n_ents, argc, - argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 080a36a909c..ed6bc3a9a49 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -187,7 +187,7 @@ static struct suite suites[] = { SUITE(pci_mps), #endif #ifdef CONFIG_CMD_SEAMA - SUITE_CMD(seama, do_ut_seama), + SUITE(seama), #endif #ifdef CONFIG_CMD_UPL SUITE_CMD(upl, do_ut_upl),

Use the new suite-runner to run these tests instead.

It is not clear that these actually work, since they are not enabled on sandbox for some reason.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/suites.h | 1 - test/boot/upl.c | 8 -------- test/cmd_ut.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h index cd758b8c464..20e6a2a113b 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -35,6 +35,5 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

#endif /* __TEST_SUITES_H__ */ diff --git a/test/boot/upl.c b/test/boot/upl.c index 2c9b8bc8bc0..aa58cdf083b 100644 --- a/test/boot/upl.c +++ b/test/boot/upl.c @@ -426,11 +426,3 @@ static int upl_test_info_norun(struct unit_test_state *uts) return 0; } UPL_TEST(upl_test_info_norun, UTF_CONSOLE | UTF_MANUAL); - -int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(upl); - const int n_ents = UNIT_TEST_SUITE_COUNT(upl); - - return cmd_ut_category("upl", "cmd_upl_", tests, n_ents, argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index ed6bc3a9a49..efcac626a5b 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -190,7 +190,7 @@ static struct suite suites[] = { SUITE(seama), #endif #ifdef CONFIG_CMD_UPL - SUITE_CMD(upl, do_ut_upl), + SUITE(upl), #endif };

This is not needed anymore. If a test suite is not built, then it will have no linker-list entries. So we can just check for that and know that the suite is not present.

This allows removal of the #ifdefs and the need to keep them in sync with the associated Makefile rules, which has actually failed, since the help does not match what commands are actually present.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Show a message when a suite is not compiled in

test/cmd_ut.c | 81 +++++++++++++++++-------------------- test/py/tests/test_suite.py | 11 ++++- 2 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 181cdb43152..16490e00ab3 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -120,78 +120,55 @@ SUITE_DECL(seama); SUITE_DECL(upl);

static struct suite suites[] = { -#ifdef CONFIG_CMD_BDI SUITE(bdinfo), -#endif #ifdef CONFIG_UT_BOOTSTD SUITE_CMD(bootstd, do_ut_bootstd), #endif -#ifdef CONFIG_CMDLINE SUITE(cmd), -#endif SUITE(common), -#if defined(CONFIG_UT_DM) SUITE(dm), -#endif -#if defined(CONFIG_UT_ENV) SUITE(env), -#endif SUITE(exit), -#ifdef CONFIG_CMD_FDT SUITE(fdt), -#endif -#ifdef CONFIG_CONSOLE_TRUETYPE SUITE(font), -#endif #ifdef CONFIG_UT_OPTEE SUITE_CMD(optee, do_ut_optee), #endif #ifdef CONFIG_UT_OVERLAY SUITE_CMD(overlay, do_ut_overlay), #endif -#ifdef CONFIG_UT_LIB SUITE(lib), -#endif -#ifdef CONFIG_UT_LOG SUITE(log), -#endif -#if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_MBR) && defined(CONFIG_CMD_MMC) \ - && defined(CONFIG_MMC_SANDBOX) && defined(CONFIG_MMC_WRITE) SUITE(mbr), -#endif SUITE(mem), -#if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR) SUITE(setexpr), -#endif -#ifdef CONFIG_MEASURED_BOOT SUITE(measurement), -#endif -#ifdef CONFIG_SANDBOX -#if CONFIG_IS_ENABLED(BLOBLIST) SUITE(bloblist), SUITE(bootm), -#endif -#endif -#ifdef CONFIG_CMD_ADDRMAP SUITE(addrmap), -#endif -#if CONFIG_IS_ENABLED(HUSH_PARSER) SUITE(hush), -#endif -#ifdef CONFIG_CMD_LOADM SUITE(loadm), -#endif -#ifdef CONFIG_CMD_PCI_MPS SUITE(pci_mps), -#endif -#ifdef CONFIG_CMD_SEAMA SUITE(seama), -#endif -#ifdef CONFIG_CMD_UPL SUITE(upl), -#endif };

+/** + * has_tests() - Check if a suite has tests, i.e. is supported in this build + * + * If the suite is run using a command, we have to assume that tests may be + * present, since we have no visibility + * + * @ste: Suite to check + * Return: true if supported, false if not + */ +static bool has_tests(struct suite *ste) +{ + int n_ents = ste->end - ste->start; + + return n_ents || ste->cmd; +} + /** run_suite() - Run a suite of tests */ static int run_suite(struct suite *ste, struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -224,10 +201,12 @@ static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc, struct suite *ste = &suites[i]; char *const argv[] = {(char *)ste->name, NULL};

- printf("----Running %s tests----\n", ste->name); - retval = run_suite(ste, cmdtp, flag, 1, argv); - if (!any_fail) - any_fail = retval; + if (has_tests(ste)) { + printf("----Running %s tests----\n", ste->name); + retval = run_suite(ste, cmdtp, flag, 1, argv); + if (!any_fail) + any_fail = retval; + } }

return any_fail; @@ -236,9 +215,17 @@ static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc, static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + int suite_count, i; const char *flags;

- printf("Test suites: %d\n", (int)ARRAY_SIZE(suites)); + for (suite_count = 0, i = 0; i < ARRAY_SIZE(suites); i++) { + struct suite *ste = &suites[i]; + + if (has_tests(ste)) + suite_count++; + } + + printf("Test suites: %d\n", suite_count); printf("Total tests: %d\n", (int)UNIT_TEST_ALL_COUNT());

flags = cmd_arg1(argc, argv); @@ -253,7 +240,7 @@ static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc,

if (n_ent) printf("%5ld %s\n", n_ent, ste->name); - else + else if (ste->cmd) printf("%5s %s\n", "?", ste->name); } } @@ -297,6 +284,10 @@ static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (!ste) { printf("Suite '%s' not found\n", argv[0]); return CMD_RET_FAILURE; + } else if (!has_tests(ste)) { + /* perhaps a Kconfig option needs to be set? */ + printf("Suite '%s' is not enabled\n", argv[0]); + return CMD_RET_FAILURE; }

ret = run_suite(ste, cmdtp, flag, argc, argv); diff --git a/test/py/tests/test_suite.py b/test/py/tests/test_suite.py index 20cdf022536..a4d7391ce5f 100644 --- a/test/py/tests/test_suite.py +++ b/test/py/tests/test_suite.py @@ -128,7 +128,7 @@ def process_ut_info(cons, output): @pytest.mark.buildconfigspec('sandbox') @pytest.mark.notbuildconfigspec('sandbox_spl') @pytest.mark.notbuildconfigspec('sandbox64') -def test_suite(u_boot_console): +def test_suite(u_boot_console, u_boot_config): """Perform various checks on the unit tests, including:

- The number of suites matches that reported by the 'ut info' @@ -141,6 +141,7 @@ def test_suite(u_boot_console):

""" cons = u_boot_console + buildconfig = u_boot_config.buildconfig with cons.log.section('Run all unit tests'): # ut hush hush_test_simple_dollar prints "Unknown command" on purpose. with u_boot_console.disable_check('unknown_command'): @@ -154,7 +155,13 @@ def test_suite(u_boot_console): cons.log.info(f'extra {extra}')

# Make sure we got a test count for each suite - assert suites - exp_test_count.keys() == set() + assert not (suites - exp_test_count.keys()) + + # Deal with missing suites + with cons.log.section('Check missing suites'): + if 'config_cmd_seama' not in buildconfig: + cons.log.info("CMD_SEAMA not enabled: Ignoring suite 'seama'") + missing.discard('seama')

# Run 'ut info' and compare with the log results with cons.log.section('Check suite test-counts'):

Use a struct to hold the stats, since we also want to have the same stats for all runs as we have for each suite.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

include/test/test.h | 17 +++++++++++++---- test/test-main.c | 29 +++++++++++++++-------------- test/ut.c | 4 ++-- 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/include/test/test.h b/include/test/test.h index 21c0478befe..bc8f0bbe501 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -9,11 +9,21 @@ #include <malloc.h> #include <linux/bitops.h>

-/* - * struct unit_test_state - Entire state of test system +/** + * struct ut_stats - Statistics about tests run * * @fail_count: Number of tests that failed * @skip_count: Number of tests that were skipped + */ +struct ut_stats { + int fail_count; + int skip_count; +}; + +/* + * struct unit_test_state - Entire state of test system + * + * @cur: Statistics for the current run * @start: Store the starting mallinfo when doing leak test * @of_live: true to use livetree if available, false to use flattree * @of_root: Record of the livetree root node (used for setting up tests) @@ -34,8 +44,7 @@ * @actual_str: Temporary string used to hold actual string value */ struct unit_test_state { - int fail_count; - int skip_count; + struct ut_stats cur; struct mallinfo start; struct device_node *of_root; bool of_live; diff --git a/test/test-main.c b/test/test-main.c index 391d4e7bb0e..e8aecd267c7 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -448,7 +448,7 @@ static int test_post_run(struct unit_test_state *uts, struct unit_test *test) */ static int skip_test(struct unit_test_state *uts) { - uts->skip_count++; + uts->cur.skip_count++;

return -EAGAIN; } @@ -460,7 +460,7 @@ static int skip_test(struct unit_test_state *uts) * the name of each test before running it. * * @uts: Test state to update. The caller should ensure that this is zeroed for - * the first call to this function. On exit, @uts->fail_count is + * the first call to this function. On exit, @uts->cur.fail_count is * incremented by the number of failures (0, one hopes) * @test_name: Test to run * @name: Name of test, possibly skipping a prefix that should not be displayed @@ -510,7 +510,7 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test, * SPL. * * @uts: Test state to update. The caller should ensure that this is zeroed for - * the first call to this function. On exit, @uts->fail_count is + * the first call to this function. On exit, @uts->cur.fail_count is * incremented by the number of failures (0, one hopes) * @test: Test to run * Return: 0 if all tests passed, -EAGAIN if the test should be skipped, -1 if @@ -574,7 +574,7 @@ static int ut_run_test_live_flat(struct unit_test_state *uts, * the name of each test before running it. * * @uts: Test state to update. The caller should ensure that this is zeroed for - * the first call to this function. On exit, @uts->fail_count is + * the first call to this function. On exit, @uts->cur.fail_count is * incremented by the number of failures (0, one hopes) * @prefix: String prefix for the tests. Any tests that have this prefix will be * printed without the prefix, so that it is easier to see the unique part @@ -632,7 +632,7 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, if (len < 6 || strcmp(test_name + len - 6, "_norun")) { printf("Test '%s' is manual so must have a name ending in _norun\n", test_name); - uts->fail_count++; + uts->cur.fail_count++; return -EBADF; } if (!uts->force_run) { @@ -641,23 +641,24 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, continue; } } - old_fail_count = uts->fail_count; + old_fail_count = uts->cur.fail_count;

if (one && upto == pos) { ret = ut_run_test_live_flat(uts, one); - if (uts->fail_count != old_fail_count) { + if (uts->cur.fail_count != old_fail_count) { printf("Test '%s' failed %d times (position %d)\n", one->name, - uts->fail_count - old_fail_count, pos); + uts->cur.fail_count - old_fail_count, + pos); } return -EBADF; }

for (i = 0; i < uts->runs_per_test; i++) ret = ut_run_test_live_flat(uts, test); - if (uts->fail_count != old_fail_count) { + if (uts->cur.fail_count != old_fail_count) { printf("Test '%s' failed %d times\n", test_name, - uts->fail_count - old_fail_count); + uts->cur.fail_count - old_fail_count); } found++; if (ret == -EAGAIN) @@ -668,7 +669,7 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, if (select_name && !found) return -ENOENT;

- return uts->fail_count ? -EBADF : 0; + return uts->cur.fail_count ? -EBADF : 0; }

int ut_run_list(struct unit_test_state *uts, const char *category, @@ -716,12 +717,12 @@ int ut_run_list(struct unit_test_state *uts, const char *category, if (has_dm_tests) dm_test_restore(uts->of_root);

- if (uts->skip_count) - printf("Skipped: %d, ", uts->skip_count); + if (uts->cur.skip_count) + printf("Skipped: %d, ", uts->cur.skip_count); if (ret == -ENOENT) printf("Test '%s' not found\n", select_name); else - printf("Failures: %d\n", uts->fail_count); + printf("Failures: %d\n", uts->cur.fail_count);

return ret; } diff --git a/test/ut.c b/test/ut.c index 7454da3e001..a16fdfb3a93 100644 --- a/test/ut.c +++ b/test/ut.c @@ -21,7 +21,7 @@ void ut_fail(struct unit_test_state *uts, const char *fname, int line, { gd->flags &= ~(GD_FLG_SILENT | GD_FLG_RECORD); printf("%s:%d, %s(): %s\n", fname, line, func, cond); - uts->fail_count++; + uts->cur.fail_count++; }

void ut_failf(struct unit_test_state *uts, const char *fname, int line, @@ -35,7 +35,7 @@ void ut_failf(struct unit_test_state *uts, const char *fname, int line, vprintf(fmt, args); va_end(args); putc('\n'); - uts->fail_count++; + uts->cur.fail_count++; }

ulong ut_check_free(void)

Add a function to show the stats, so we can decide when to print it.

This slightly adjusts the output, so that any 'test not found' message appears on its own line after all other output.

The 'failures' message now appears in lower case so update pytest accordingly.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Adjust ut_report() to take a run-count

arch/sandbox/cpu/spl.c | 1 + include/test/ut.h | 8 ++++++++ test/py/tests/test_spl.py | 2 +- test/py/tests/test_upl.py | 2 +- test/py/tests/test_ut.py | 2 +- test/py/tests/test_vbe.py | 2 +- test/py/tests/test_vpl.py | 2 +- test/test-main.c | 18 +++++++++++++----- 8 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 0ad23e4ba95..ecc03785463 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -153,6 +153,7 @@ void spl_board_init(void) ut_init_state(&uts); ret = ut_run_list(&uts, "spl", NULL, tests, count, state->select_unittests, 1, false, NULL); + ut_report(&uts.cur, 1); ut_uninit_state(&uts); /* continue execution into U-Boot */ } diff --git a/include/test/ut.h b/include/test/ut.h index a51defc3b90..be5502e03a1 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -530,4 +530,12 @@ int ut_run_list(struct unit_test_state *uts, const char *category, const char *select_name, int runs_per_test, bool force_run, const char *test_insert);

+/** + * ut_report() - Report stats on a test run + * + * @stats: Stats to show + * @run_count: Number of suites that were run + */ +void ut_report(struct ut_stats *stats, int run_count); + #endif diff --git a/test/py/tests/test_spl.py b/test/py/tests/test_spl.py index 42e4c4342b2..474f430a344 100644 --- a/test/py/tests/test_spl.py +++ b/test/py/tests/test_spl.py @@ -36,7 +36,7 @@ def test_spl(u_boot_console, ut_spl_subtest): cons = u_boot_console cons.restart_uboot_with_flags(['-u', '-k', ut_spl_subtest.split()[1]]) output = cons.get_spawn_output().replace('\r', '') - assert 'Failures: 0' in output + assert 'failures: 0' in output finally: # Restart afterward in case a non-SPL test is run next. This should not # happen since SPL tests are run in their own invocation of test.py, but diff --git a/test/py/tests/test_upl.py b/test/py/tests/test_upl.py index 3164bda6b71..d94359d8b9b 100644 --- a/test/py/tests/test_upl.py +++ b/test/py/tests/test_upl.py @@ -35,4 +35,4 @@ def test_upl_handoff(u_boot_console):

# Check the FIT offsets look correct output = cons.run_command('ut upl -f upl_test_info_norun') - assert 'Failures: 0' in output + assert 'failures: 0' in output diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py index cacf11f7c0a..d2d8ce10755 100644 --- a/test/py/tests/test_ut.py +++ b/test/py/tests/test_ut.py @@ -607,4 +607,4 @@ def test_ut(u_boot_console, ut_subtest): assert 'Unknown command 'quux' - try 'help'' in output else: output = u_boot_console.run_command('ut ' + ut_subtest) - assert output.endswith('Failures: 0') + assert output.endswith('failures: 0') diff --git a/test/py/tests/test_vbe.py b/test/py/tests/test_vbe.py index 50b6c1cd911..861df3f8266 100644 --- a/test/py/tests/test_vbe.py +++ b/test/py/tests/test_vbe.py @@ -117,4 +117,4 @@ def test_vbe(u_boot_console): with cons.log.section('Kernel load'): output = cons.run_command_list(cmd.splitlines())

- assert 'Failures: 0' in output[-1] + assert 'failures: 0' in output[-1] diff --git a/test/py/tests/test_vpl.py b/test/py/tests/test_vpl.py index 4af578b9173..8c472ca7a92 100644 --- a/test/py/tests/test_vpl.py +++ b/test/py/tests/test_vpl.py @@ -26,7 +26,7 @@ def test_vpl(u_boot_console, ut_vpl_subtest): cons = u_boot_console cons.restart_uboot_with_flags(['-u', '-k', ut_vpl_subtest.split()[1]]) output = cons.get_spawn_output().replace('\r', '') - assert 'Failures: 0' in output + assert 'failures: 0' in output finally: # Restart afterward in case a non-VPL test is run next. This should not # happen since VPL tests are run in their own invocation of test.py, but diff --git a/test/test-main.c b/test/test-main.c index e36bc37d29e..d02ab791b5a 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -673,6 +673,18 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, return uts->cur.fail_count ? -EBADF : 0; }

+void ut_report(struct ut_stats *stats, int run_count) +{ + if (run_count > 1) + printf("Suites run: %d, total tests", run_count); + else + printf("Tests"); + printf(" run: %d, ", stats->test_count); + if (stats->skip_count) + printf("skipped: %d, ", stats->skip_count); + printf("failures: %d\n", stats->fail_count); +} + int ut_run_list(struct unit_test_state *uts, const char *category, const char *prefix, struct unit_test *tests, int count, const char *select_name, int runs_per_test, bool force_run, @@ -718,13 +730,9 @@ int ut_run_list(struct unit_test_state *uts, const char *category, if (has_dm_tests) dm_test_restore(uts->of_root);

- printf("Tests run: %d, ", uts->cur.test_count); - if (uts->cur.skip_count) - printf("Skipped: %d, ", uts->cur.skip_count); + ut_report(&uts->cur, 1); if (ret == -ENOENT) printf("Test '%s' not found\n", select_name); - else - printf("Failures: %d\n", uts->cur.fail_count);

return ret; }

Put the suites in order by name, for easier code-maintenance. This also helps find test results for a particular swuit in the 'ut all' output.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

test/cmd_ut.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 0b8bfe603b9..2e5519b55f9 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -90,7 +90,10 @@ int cmd_ut_category(struct unit_test_state *uts, const char *name, NULL, \ }

+SUITE_DECL(addrmap); SUITE_DECL(bdinfo); +SUITE_DECL(bloblist); +SUITE_DECL(bootm); SUITE_DECL(bootstd); SUITE_DECL(cmd); SUITE_DECL(common); @@ -99,25 +102,25 @@ SUITE_DECL(env); SUITE_DECL(exit); SUITE_DECL(fdt); SUITE_DECL(font); -SUITE_DECL(optee); -SUITE_DECL(overlay); +SUITE_DECL(hush); SUITE_DECL(lib); +SUITE_DECL(loadm); SUITE_DECL(log); SUITE_DECL(mbr); -SUITE_DECL(mem); -SUITE_DECL(setexpr); SUITE_DECL(measurement); -SUITE_DECL(bloblist); -SUITE_DECL(bootm); -SUITE_DECL(addrmap); -SUITE_DECL(hush); -SUITE_DECL(loadm); +SUITE_DECL(mem); +SUITE_DECL(optee); +SUITE_DECL(overlay); SUITE_DECL(pci_mps); SUITE_DECL(seama); +SUITE_DECL(setexpr); SUITE_DECL(upl);

static struct suite suites[] = { + SUITE(addrmap), SUITE(bdinfo), + SUITE(bloblist), + SUITE(bootm), #ifdef CONFIG_UT_BOOTSTD SUITE_CMD(bootstd, do_ut_bootstd), #endif @@ -128,25 +131,22 @@ static struct suite suites[] = { SUITE(exit), SUITE(fdt), SUITE(font), + SUITE(hush), + SUITE(lib), + SUITE(loadm), + SUITE(log), + SUITE(mbr), + SUITE(measurement), + SUITE(mem), #ifdef CONFIG_UT_OPTEE SUITE_CMD(optee, do_ut_optee), #endif #ifdef CONFIG_UT_OVERLAY SUITE_CMD(overlay, do_ut_overlay), #endif - SUITE(lib), - SUITE(log), - SUITE(mbr), - SUITE(mem), - SUITE(setexpr), - SUITE(measurement), - SUITE(bloblist), - SUITE(bootm), - SUITE(addrmap), - SUITE(hush), - SUITE(loadm), SUITE(pci_mps), SUITE(seama), + SUITE(setexpr), SUITE(upl), };

Rather than having the help in the longhelp, put it in the suite info so 'ut info -s' can show it. This is tidier, particular due to the removal of #ifdefs

This means that the help text is present in the image (although not displayed with 'ut info -s') so the image-size increases. But with UNIT_TEST enabled, we expect large images so this doesn't seem important.

Signed-off-by: Simon Glass sjg@chromium.org ---

(no changes since v1)

test/cmd_ut.c | 123 ++++++++++++++++---------------------------------- 1 file changed, 38 insertions(+), 85 deletions(-)

diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 2e5519b55f9..fbfdaaae0b5 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -21,12 +21,14 @@ * @start: First test in 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 */ struct suite { const char *name; struct unit_test *start; struct unit_test *end; ut_cmd_func cmd; + const char *help; };

static int do_ut_all(struct unit_test_state *uts, struct cmd_tbl *cmdtp, @@ -75,19 +77,21 @@ int cmd_ut_category(struct unit_test_state *uts, const char *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) { \ +#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 */ -#define SUITE(_name) { \ +#define SUITE(_name, _help) { \ #_name, \ suite_start_ ## _name, \ suite_end_ ## _name, \ NULL, \ + _help, \ }

SUITE_DECL(addrmap); @@ -117,37 +121,37 @@ SUITE_DECL(setexpr); SUITE_DECL(upl);

static struct suite suites[] = { - SUITE(addrmap), - SUITE(bdinfo), - SUITE(bloblist), - SUITE(bootm), + SUITE(addrmap, "very basic test of addrmap command"), + SUITE(bdinfo, "bdinfo (board info) command"), + SUITE(bloblist, "bloblist implementation"), + SUITE(bootm, "bootm command"), #ifdef CONFIG_UT_BOOTSTD - SUITE_CMD(bootstd, do_ut_bootstd), + SUITE_CMD(bootstd, do_ut_bootstd, "standard boot implementation"), #endif - SUITE(cmd), - SUITE(common), - SUITE(dm), - SUITE(env), - SUITE(exit), - SUITE(fdt), - SUITE(font), - SUITE(hush), - SUITE(lib), - SUITE(loadm), - SUITE(log), - SUITE(mbr), - SUITE(measurement), - SUITE(mem), + SUITE(cmd, "various commands"), + SUITE(common, "tests for common/ directory"), + SUITE(dm, "driver model"), + SUITE(env, "environment"), + SUITE(exit, "shell exit and variables"), + SUITE(fdt, "fdt command"), + SUITE(font, "font command"), + SUITE(hush, "hush behaviour"), + SUITE(lib, "library functions"), + SUITE(loadm, "loadm command parameters and loading memory blob"), + SUITE(log, "logging functions"), + SUITE(mbr, "mbr command"), + SUITE(measurement, "TPM-based measured boot"), + SUITE(mem, "memory-related commands"), #ifdef CONFIG_UT_OPTEE - SUITE_CMD(optee, do_ut_optee), + SUITE_CMD(optee, do_ut_optee, "OP-TEE"), #endif #ifdef CONFIG_UT_OVERLAY - SUITE_CMD(overlay, do_ut_overlay), + SUITE_CMD(overlay, do_ut_overlay, "device tree overlays"), #endif - SUITE(pci_mps), - SUITE(seama), - SUITE(setexpr), - SUITE(upl), + SUITE(pci_mps, "PCI Express Maximum Payload Size"), + SUITE(seama, "seama command parameters loading and decoding"), + SUITE(setexpr, "setexpr command"), + SUITE(upl, "Universal payload support"), };

/** @@ -231,16 +235,19 @@ static int do_ut_info(struct cmd_tbl *cmdtp, int flag, int argc, if (flags && !strcmp("-s", flags)) { int i;

- puts("\nTests Suite\n"); - puts("----- -----\n"); + puts("\nTests Suite Purpose"); + puts("\n----- ------------ -------------------------\n"); for (i = 0; i < ARRAY_SIZE(suites); i++) { struct suite *ste = &suites[i]; long n_ent = ste->end - ste->start;

if (n_ent) - printf("%5ld %s\n", n_ent, ste->name); + printf("%5ld", n_ent); else if (ste->cmd) - printf("%5s %s\n", "?", ste->name); + printf("%5s", "?"); + else /* suite is not present */ + continue; + printf(" %-13.13s %s\n", ste->name, ste->help); } }

@@ -309,60 +316,6 @@ U_BOOT_LONGHELP(ut, "\nOptions for <suite>:" "\nall - execute all enabled tests" "\ninfo [-s] - show info about tests [and suites]" -#ifdef CONFIG_CMD_ADDRMAP - "\naddrmap - very basic test of addrmap command" -#endif -#ifdef CONFIG_CMD_BDI - "\nbdinfo - bdinfo command" -#endif -#ifdef CONFIG_SANDBOX - "\nbloblist - bloblist implementation" -#endif -#ifdef CONFIG_BOOTSTD - "\nbootstd - standard boot implementation" -#endif -#ifdef CONFIG_CMDLINE - "\ncmd - test various commands" -#endif - "\ncommon - tests for common/ directory" -#ifdef CONFIG_UT_DM - "\ndm - driver model" -#endif -#ifdef CONFIG_UT_ENV - "\nenv - environment" -#endif -#ifdef CONFIG_CMD_FDT - "\nfdt - fdt command" -#endif -#ifdef CONFIG_CONSOLE_TRUETYPE - "\nfont - font command" -#endif -#if CONFIG_IS_ENABLED(HUSH_PARSER) - "\nhush - Test hush behavior" -#endif -#ifdef CONFIG_CMD_LOADM - "\nloadm - loadm command parameters and loading memory blob" -#endif -#ifdef CONFIG_UT_LIB - "\nlib - library functions" -#endif -#ifdef CONFIG_UT_LOG - "\nlog - logging functions" -#endif - "\nmem - memory-related commands" -#ifdef CONFIG_UT_OPTEE - "\noptee - test OP-TEE" -#endif -#ifdef CONFIG_UT_OVERLAY - "\noverlay - device tree overlays" -#endif -#ifdef CONFIG_CMD_PCI_MPS - "\npci_mps - PCI Express Maximum Payload Size" -#endif - "\nsetexpr - setexpr command" -#ifdef CONFIG_CMD_SEAMA - "\nseama - seama command parameters loading and decoding" -#endif );

U_BOOT_CMD(