test: Drop the _test suffix on linker lists
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>
diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c
index 4389761..fd01171 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 @@
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 7642948..b0b24bc 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 @@
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 cf65c05..d1eacdc 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 @@
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 e647851..74fd603 100644
--- a/test/cmd/fdt.c
+++ b/test/cmd/fdt.c
@@ -23,7 +23,7 @@
*/
/* 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 @@
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 3335dd6..d860efe 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 @@
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 dedb4f7..78bb12c 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 @@
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 d137378..ad85992 100644
--- a/test/cmd/mbr.c
+++ b/test/cmd/mbr.c
@@ -470,12 +470,12 @@
}
/* 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 d6f2544..2b78e42 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 67eca32..3e904fc 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 3a031ee..df8938b 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 0c57d15..2595ea1 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 @@
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 28d6b9a..39590d1 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 @@
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 9b3277f..49eac58 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 @@
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);