From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH v3 33/41] test: Add a macros for finding tests in linker_lists
Date: Wed, 3 Feb 2021 05:44:39 -0700 [thread overview]
Message-ID: <20210203124447.2458527-33-sjg@chromium.org> (raw)
In-Reply-To: <20210203124447.2458527-1-sjg@chromium.org>
At present we use the linker list directly. This is not very friendly, so
add a helpful macro instead. This will also allow us to change the naming
later without updating this code.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
include/test/test.h | 6 ++++++
test/bloblist.c | 5 ++---
test/bootm.c | 4 ++--
test/cmd/mem.c | 4 ++--
test/cmd/setexpr.c | 5 ++---
test/compression.c | 5 ++---
test/dm/test-dm.c | 4 ++--
test/env/cmd_ut_env.c | 4 ++--
test/lib/cmd_ut_lib.c | 4 ++--
test/log/log_ut.c | 4 ++--
test/optee/cmd_ut_optee.c | 5 ++---
test/overlay/cmd_ut_overlay.c | 5 ++---
test/str_ut.c | 5 ++---
test/unicode_ut.c | 4 ++--
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/include/test/test.h b/include/test/test.h
index 5eeec35f525..b16c9135f2c 100644
--- a/include/test/test.h
+++ b/include/test/test.h
@@ -93,6 +93,12 @@ struct unit_test {
.func = _name, \
}
+/* Get the start of a list of unit tests for a particular category */
+#define UNIT_TEST_SUITE_START(_suite) \
+ ll_entry_start(struct unit_test, _suite)
+#define UNIT_TEST_SUITE_COUNT(_suite) \
+ ll_entry_count(struct unit_test, _suite)
+
/* Sizes for devres tests */
enum {
TEST_DEVRES_SIZE = 100,
diff --git a/test/bloblist.c b/test/bloblist.c
index 85a6c39680e..22da080a543 100644
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -386,9 +386,8 @@ BLOBLIST_TEST(bloblist_test_reloc, 0);
int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test,
- bloblist_test);
- const int n_ents = ll_entry_count(struct unit_test, bloblist_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(bloblist_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(bloblist_test);
return cmd_ut_category("bloblist", "bloblist_test_",
tests, n_ents, argc, argv);
diff --git a/test/bootm.c b/test/bootm.c
index 92dc2b6e173..6d9e1b8201b 100644
--- a/test/bootm.c
+++ b/test/bootm.c
@@ -239,8 +239,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 = ll_entry_start(struct unit_test, bootm_test);
- const int n_ents = ll_entry_count(struct unit_test, bootm_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(bootm_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(bootm_test);
return cmd_ut_category("bootm", "bootm_test_", tests, n_ents,
argc, argv);
diff --git a/test/cmd/mem.c b/test/cmd/mem.c
index fbaa8a4b3cf..d76f47cf311 100644
--- a/test/cmd/mem.c
+++ b/test/cmd/mem.c
@@ -12,8 +12,8 @@
int do_ut_mem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test, mem_test);
- const int n_ents = ll_entry_count(struct unit_test, mem_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(mem_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(mem_test);
return cmd_ut_category("cmd_mem", "mem_test_", tests, n_ents, argc,
argv);
diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c
index b483069ff0f..27113c083c5 100644
--- a/test/cmd/setexpr.c
+++ b/test/cmd/setexpr.c
@@ -390,9 +390,8 @@ SETEXPR_TEST(setexpr_test_str_long, UT_TESTF_CONSOLE_REC);
int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test,
- setexpr_test);
- const int n_ents = ll_entry_count(struct unit_test, setexpr_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(setexpr_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(setexpr_test);
return cmd_ut_category("cmd_setexpr", "setexpr_test_", tests, n_ents,
argc, argv);
diff --git a/test/compression.c b/test/compression.c
index a2a4b9ff9e8..4cd1be564f3 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -539,9 +539,8 @@ COMPRESSION_TEST(compression_test_bootm_none, 0);
int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test,
- compression_test);
- const int n_ents = ll_entry_count(struct unit_test, compression_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(compression_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(compression_test);
return cmd_ut_category("compression", "compression_test_",
tests, n_ents, argc, argv);
diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index 4f7d5736a53..f1f1b0f0149 100644
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
int dm_test_run(const char *test_name)
{
- struct unit_test *tests = ll_entry_start(struct unit_test, dm_test);
- const int n_ents = ll_entry_count(struct unit_test, dm_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(dm_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(dm_test);
int ret;
ret = ut_run_list("driver model", "dm_test_", tests, n_ents, test_name);
diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c
index a440b1bfb0e..d65a32179ce 100644
--- a/test/env/cmd_ut_env.c
+++ b/test/env/cmd_ut_env.c
@@ -12,8 +12,8 @@
int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test, env_test);
- const int n_ents = ll_entry_count(struct unit_test, env_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(env_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(env_test);
return cmd_ut_category("environment", "env_test_",
tests, n_ents, argc, argv);
diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c
index f5c7bf3d3b0..f1ac015b2c8 100644
--- a/test/lib/cmd_ut_lib.c
+++ b/test/lib/cmd_ut_lib.c
@@ -13,8 +13,8 @@
int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test, lib_test);
- const int n_ents = ll_entry_count(struct unit_test, lib_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(lib_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(lib_test);
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 c534add493e..5aa3a184004 100644
--- a/test/log/log_ut.c
+++ b/test/log/log_ut.c
@@ -13,8 +13,8 @@
int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test, log_test);
- const int n_ents = ll_entry_count(struct unit_test, log_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(log_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(log_test);
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 9fa4c91e0dd..c3887ab11d9 100644
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -94,9 +94,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 = ll_entry_start(struct unit_test,
- optee_test);
- const int n_ents = ll_entry_count(struct unit_test, optee_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(optee_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(optee_test);
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 c001fb183fe..56a3df17138 100644
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -213,9 +213,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 = ll_entry_start(struct unit_test,
- overlay_test);
- const int n_ents = ll_entry_count(struct unit_test, overlay_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(overlay_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(overlay_test);
struct unit_test_state *uts;
void *fdt_base = &__dtb_test_fdt_base_begin;
void *fdt_overlay = &__dtb_test_fdt_overlay_begin;
diff --git a/test/str_ut.c b/test/str_ut.c
index cd5045516d1..359d7d4ea1f 100644
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -107,9 +107,8 @@ STR_TEST(str_simple_strtoul, 0);
int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test,
- str_test);
- const int n_ents = ll_entry_count(struct unit_test, str_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(str_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(str_test);
return cmd_ut_category("str", "str_", tests, n_ents, argc, argv);
}
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index 6130ef0b549..7b9c020eff9 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -615,8 +615,8 @@ UNICODE_TEST(unicode_test_efi_create_indexed_name);
int do_ut_unicode(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- struct unit_test *tests = ll_entry_start(struct unit_test, unicode_test);
- const int n_ents = ll_entry_count(struct unit_test, unicode_test);
+ struct unit_test *tests = UNIT_TEST_SUITE_START(unicode_test);
+ const int n_ents = UNIT_TEST_SUITE_COUNT(unicode_test);
return cmd_ut_category("Unicode", "unicode_test_",
tests, n_ents, argc, argv);
--
2.30.0.365.g02bc693789-goog
next prev parent reply other threads:[~2021-02-03 12:44 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 12:44 [PATCH v3 00/41] test: Refactor tests to have a single test runner Simon Glass
2021-02-03 12:44 ` [PATCH v3 01/41] doc: Tidy up testing section Simon Glass
2021-02-03 12:44 ` [PATCH v3 02/41] doc: Document make tcheck Simon Glass
2021-02-03 12:44 ` [PATCH v3 03/41] sandbox: Drop the 'starting...' message unless testing Simon Glass
2021-02-03 12:44 ` [PATCH v3 04/41] test: Re-enable test_ofplatdata Simon Glass
2021-02-03 12:44 ` [PATCH v3 05/41] doc: Explain how to run tests without pytest Simon Glass
2021-02-03 12:44 ` [PATCH v3 06/41] doc: Document how sandbox_spl_tests are run Simon Glass
2021-02-03 14:40 ` Pratyush Yadav
2021-02-03 12:44 ` [PATCH v3 07/41] test: Correct setexpr test prefix Simon Glass
2021-02-03 12:44 ` [PATCH v3 08/41] test: Mark all driver model tests with a flag Simon Glass
2021-02-03 12:44 ` [PATCH v3 09/41] test: Rename test-main.c to test-dm.c Simon Glass
2021-02-03 12:44 ` [PATCH v3 10/41] test: Add an overall test runner Simon Glass
2021-02-03 12:44 ` [PATCH v3 11/41] test: Create pre/post-run functions Simon Glass
2021-02-03 12:44 ` [PATCH v3 12/41] test: Call test_pre/post_run() from driver model tests Simon Glass
2021-02-03 12:44 ` [PATCH v3 13/41] test: Move dm_extended_scan() to test_pre_run() Simon Glass
2021-02-03 12:44 ` [PATCH v3 14/41] test: Move do_autoprobe() " Simon Glass
2021-02-03 12:44 ` [PATCH v3 15/41] test: Move dm_scan_plat() " Simon Glass
2021-02-03 12:44 ` [PATCH v3 16/41] test: Drop mallinfo() work-around Simon Glass
2021-02-03 12:44 ` [PATCH v3 17/41] test: Move console silencing to test_pre_run() Simon Glass
2021-02-03 12:44 ` [PATCH v3 18/41] test: Move delay skipping " Simon Glass
2021-02-03 12:44 ` [PATCH v3 19/41] test: Handle driver model reinit in test_pre_run() Simon Glass
2021-02-03 12:44 ` [PATCH v3 20/41] test: Drop struct dm_test_state Simon Glass
2021-02-03 12:44 ` [PATCH v3 21/41] test: Move dm_test_init() into test-main.c Simon Glass
2021-02-03 12:44 ` [PATCH v3 22/41] test: Move dm_test_destroy() " Simon Glass
2021-02-03 12:44 ` [PATCH v3 23/41] test: Move test running into a separate function Simon Glass
2021-02-03 12:44 ` [PATCH v3 24/41] test: Use ut_run_test() to run driver model tests Simon Glass
2021-02-03 12:44 ` [PATCH v3 25/41] test: Drop dm_do_test() Simon Glass
2021-02-03 12:44 ` [PATCH v3 26/41] test: Add ut_run_test_live_flat() to run tests twice Simon Glass
2021-02-03 12:44 ` [PATCH v3 27/41] test: Use a local variable for test state Simon Glass
2021-02-03 12:44 ` [PATCH v3 28/41] test: Run driver-model tests using ut_run_list() Simon Glass
2021-02-03 12:44 ` [PATCH v3 29/41] test: Use return values in dm_test_run() Simon Glass
2021-02-03 12:44 ` [PATCH v3 30/41] test: Move the devicetree check into ut_run_list() Simon Glass
2021-02-03 12:44 ` [PATCH v3 31/41] test: Move restoring of driver model state to ut_run_list() Simon Glass
2021-02-03 12:44 ` [PATCH v3 32/41] test: log: Rename log main test file to log_ut.c Simon Glass
2021-02-03 12:44 ` Simon Glass [this message]
2021-02-03 12:44 ` [PATCH v3 34/41] test: Rename all linker lists to have a ut_ prefix Simon Glass
2021-02-03 12:44 ` [PATCH v3 35/41] test: Allow SPL to run any available test Simon Glass
2021-02-03 12:44 ` [PATCH v3 36/41] sandbox: Update os_find_u_boot() to find the .img file Simon Glass
2021-02-03 12:44 ` [PATCH v3 37/41] spl: Convert spl_fit to work with sandbox Simon Glass
2021-02-03 12:44 ` [PATCH v3 38/41] doc: Move coccinelle into its own section Simon Glass
2021-02-03 12:44 ` [PATCH v3 39/41] spl: test: Add a test for spl_load_simple_fit() Simon Glass
2021-02-03 12:44 ` [PATCH v3 40/41] test: sandbox: Move sandbox test docs into doc/develop Simon Glass
2021-02-03 12:44 ` [PATCH v3 41/41] doc: Explain briefly how to write new tests Simon Glass
2021-03-03 19:37 ` [PATCH v3 00/41] test: Refactor tests to have a single test runner Tom Rini
2021-03-03 20:18 ` Tom Rini
2021-03-03 20:37 ` Tom Rini
2021-03-04 3:06 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210203124447.2458527-33-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.