From: Simon Glass Date: Thu, 22 Aug 2024 13:57:49 +0000 (-0600) Subject: test: Drop the blank line before test macros X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=b073d48e8dd7d178ebd237089be730d15c72ddfc;p=u-boot.git test: Drop the blank line before test macros Most tests don't have this. It helps to keep the test declaration clearly associated with the function it relates to, rather than the next one in the file. Remove the extra blank line and mention this in the docs. Signed-off-by: Simon Glass --- diff --git a/doc/develop/tests_writing.rst b/doc/develop/tests_writing.rst index 655eb95110..c277c8dd44 100644 --- a/doc/develop/tests_writing.rst +++ b/doc/develop/tests_writing.rst @@ -228,6 +228,9 @@ Declare the test with:: } DM_TEST(dm_test_uclassname_what, UTF_SCAN_FDT); +Note that the convention is to NOT add a blank line before the macro, so that +the function it relates to is more obvious. + Replace 'uclassname' with the name of your uclass, if applicable. Replace 'what' with what you are testing. diff --git a/test/cmd/armffa.c b/test/cmd/armffa.c index f5d5a1b54a..d7b076cfe7 100644 --- a/test/cmd/armffa.c +++ b/test/cmd/armffa.c @@ -28,5 +28,4 @@ static int dm_test_armffa_cmd(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_armffa_cmd, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 973544f63f..cb88d2ee11 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -244,7 +244,6 @@ static int bdinfo_test_full(struct unit_test_state *uts) return 0; } - BDINFO_TEST(bdinfo_test_full, UTF_CONSOLE_REC); static int bdinfo_test_help(struct unit_test_state *uts) @@ -266,7 +265,6 @@ static int bdinfo_test_help(struct unit_test_state *uts) return 0; } - BDINFO_TEST(bdinfo_test_help, UTF_CONSOLE_REC); static int bdinfo_test_memory(struct unit_test_state *uts) @@ -282,7 +280,6 @@ static int bdinfo_test_memory(struct unit_test_state *uts) return 0; } - BDINFO_TEST(bdinfo_test_memory, UTF_CONSOLE_REC); static int bdinfo_test_eth(struct unit_test_state *uts) @@ -298,7 +295,6 @@ static int bdinfo_test_eth(struct unit_test_state *uts) return 0; } - BDINFO_TEST(bdinfo_test_eth, UTF_CONSOLE_REC); int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/test/cmd/exit.c b/test/cmd/exit.c index d4aac0facf..e7e454c763 100644 --- a/test/cmd/exit.c +++ b/test/cmd/exit.c @@ -121,7 +121,6 @@ static int cmd_exit_test(struct unit_test_state *uts) return 0; } - EXIT_TEST(cmd_exit_test, UTF_CONSOLE_REC); int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c index fd601ee5f5..e4b694b728 100644 --- a/test/cmd/mbr.c +++ b/test/cmd/mbr.c @@ -479,5 +479,4 @@ static int dm_test_cmd_mbr(struct unit_test_state *uts) { return mbr_test_run(uts); } - DM_TEST(dm_test_cmd_mbr, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/cmd/pci_mps.c b/test/cmd/pci_mps.c index f7f77e73a3..755a064977 100644 --- a/test/cmd/pci_mps.c +++ b/test/cmd/pci_mps.c @@ -27,7 +27,6 @@ static int test_pci_mps_safe(struct unit_test_state *uts) return 0; } - PCI_MPS_TEST(test_pci_mps_safe, UTF_CONSOLE_REC); int do_ut_pci_mps(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/test/cmd/pinmux.c b/test/cmd/pinmux.c index 23f9b9a9f3..0b4e001fa1 100644 --- a/test/cmd/pinmux.c +++ b/test/cmd/pinmux.c @@ -36,5 +36,4 @@ static int dm_test_cmd_pinmux_status_pinname(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_cmd_pinmux_status_pinname, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/cmd/pwm.c b/test/cmd/pwm.c index 494f31f4da..44f52e15cb 100644 --- a/test/cmd/pwm.c +++ b/test/cmd/pwm.c @@ -71,5 +71,4 @@ static int dm_test_pwm_cmd(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_pwm_cmd, UTF_SCAN_PDATA | UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/cmd/rw.c b/test/cmd/rw.c index 3dcf4228ee..eeda87b53e 100644 --- a/test/cmd/rw.c +++ b/test/cmd/rw.c @@ -99,5 +99,4 @@ static int dm_test_read_write(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_read_write, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index f024a33576..a4086c9451 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -478,7 +478,6 @@ static int setexpr_test_fmt(struct unit_test_state *uts) return 0; } - SETEXPR_TEST(setexpr_test_fmt, UTF_CONSOLE_REC); #endif diff --git a/test/cmd/temperature.c b/test/cmd/temperature.c index fc0c95f3d8..b86c7d44b3 100644 --- a/test/cmd/temperature.c +++ b/test/cmd/temperature.c @@ -34,5 +34,4 @@ static int dm_test_cmd_temperature(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_cmd_temperature, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c index cde74ebeb6..ee07ab2293 100644 --- a/test/cmd/test_echo.c +++ b/test/cmd/test_echo.c @@ -56,5 +56,4 @@ static int lib_test_hush_echo(struct unit_test_state *uts) } return 0; } - LIB_TEST(lib_test_hush_echo, 0); diff --git a/test/cmd/wget.c b/test/cmd/wget.c index b0feb21dc4..1ce167c4ab 100644 --- a/test/cmd/wget.c +++ b/test/cmd/wget.c @@ -223,5 +223,4 @@ static int net_test_wget(struct unit_test_state *uts) return 0; } - LIB_TEST(net_test_wget, 0); diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c index 4ba1dcc809..a556cbf8e3 100644 --- a/test/common/test_autoboot.c +++ b/test/common/test_autoboot.c @@ -91,5 +91,4 @@ static int test_autoboot(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - COMMON_TEST(test_autoboot, 0); diff --git a/test/dm/axi.c b/test/dm/axi.c index 1138a46aca..45c46a1973 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -21,7 +21,6 @@ static int dm_test_axi_base(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_axi_base, UTF_SCAN_PDATA | UTF_SCAN_FDT); /* Test that sandbox PCI bus numbering works correctly */ @@ -33,7 +32,6 @@ static int dm_test_axi_busnum(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_axi_busnum, UTF_SCAN_PDATA | UTF_SCAN_FDT); /* Test that we can use the store device correctly */ @@ -74,5 +72,4 @@ static int dm_test_axi_store(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_axi_store, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index 4b0a4b3793..f66927a5d3 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -35,7 +35,6 @@ static int dm_test_bootcount_rtc(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_bootcount_rtc, UTF_SCAN_PDATA | UTF_SCAN_FDT); static int dm_test_bootcount_syscon_four_bytes(struct unit_test_state *uts) @@ -55,7 +54,6 @@ static int dm_test_bootcount_syscon_four_bytes(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_bootcount_syscon_four_bytes, UTF_SCAN_PDATA | UTF_SCAN_FDT); @@ -76,6 +74,4 @@ static int dm_test_bootcount_syscon_two_bytes(struct unit_test_state *uts) return 0; } - -DM_TEST(dm_test_bootcount_syscon_two_bytes, - UTF_SCAN_PDATA | UTF_SCAN_FDT); +DM_TEST(dm_test_bootcount_syscon_two_bytes, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/clk.c b/test/dm/clk.c index 922b053615..790968e647 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -46,7 +46,6 @@ static int dm_test_clk_base(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_clk_base, UTF_SCAN_FDT); static int dm_test_clk(struct unit_test_state *uts) diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index 95c0f42caa..ac56f17b77 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -208,5 +208,4 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) return 1; } - DM_TEST(dm_test_clk_ccf, UTF_SCAN_FDT); diff --git a/test/dm/core.c b/test/dm/core.c index 5d4678437e..e0c5b9e001 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -188,7 +188,6 @@ static int dm_test_compare_node_name(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_compare_node_name, UTF_SCAN_PDATA); /* Test that binding with uclass plat setting occurs correctly */ diff --git a/test/dm/cpu.c b/test/dm/cpu.c index 885cddb869..9b2f90ee1e 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -47,5 +47,4 @@ static int dm_test_cpu(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_cpu, UTF_SCAN_FDT); diff --git a/test/dm/dsa.c b/test/dm/dsa.c index 2537605fdc..c6b4e12a75 100644 --- a/test/dm/dsa.c +++ b/test/dm/dsa.c @@ -56,7 +56,6 @@ static int dm_test_dsa_probe(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_dsa_probe, UTF_SCAN_FDT); /* This test sends ping requests with the local address through each DSA port @@ -78,5 +77,4 @@ static int dm_test_dsa(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_dsa, UTF_SCAN_FDT); diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index bf3fd99a18..b92742472d 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -54,5 +54,4 @@ static int dm_test_dsi_host(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_dsi_host, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/eth.c b/test/dm/eth.c index 8479ebd3f2..467495863e 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -528,7 +528,6 @@ static int dm_test_eth_async_arp_reply(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_eth_async_arp_reply, UTF_SCAN_FDT); static int sb_check_ping_reply(struct udevice *dev, void *packet, @@ -613,7 +612,6 @@ static int dm_test_eth_async_ping_reply(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_eth_async_ping_reply, UTF_SCAN_FDT); #if IS_ENABLED(CONFIG_IPV6_ROUTER_DISCOVERY) @@ -659,7 +657,6 @@ static int dm_test_validate_ra(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_validate_ra, 0); static int dm_test_process_ra(struct unit_test_state *uts) @@ -698,7 +695,6 @@ static int dm_test_process_ra(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_process_ra, 0); #endif diff --git a/test/dm/extcon.c b/test/dm/extcon.c index 0f77b3d34b..91358abb5f 100644 --- a/test/dm/extcon.c +++ b/test/dm/extcon.c @@ -17,5 +17,4 @@ static int dm_test_extcon(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_extcon, UTF_SCAN_FDT); diff --git a/test/dm/ffa.c b/test/dm/ffa.c index 450e3e4156..1937d0eecb 100644 --- a/test/dm/ffa.c +++ b/test/dm/ffa.c @@ -197,7 +197,6 @@ static int dm_test_ffa_ack(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_ffa_ack, UTF_SCAN_FDT | UTF_CONSOLE_REC); static int dm_test_ffa_nack(struct unit_test_state *uts) @@ -256,5 +255,4 @@ static int dm_test_ffa_nack(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_ffa_nack, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/dm/fpga.c b/test/dm/fpga.c index 28215a3a5b..fe9f287f8c 100644 --- a/test/dm/fpga.c +++ b/test/dm/fpga.c @@ -16,5 +16,4 @@ static int dm_test_fpga(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_fpga, UTF_SCAN_FDT); diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index d6c786e93d..58bba52182 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -36,5 +36,4 @@ static int dm_test_hwspinlock_base(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_hwspinlock_base, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/i2c.c b/test/dm/i2c.c index 50a2cd0c1b..40f1f26b67 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -301,7 +301,6 @@ static int dm_test_i2c_addr_offset(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_i2c_addr_offset, UTF_SCAN_PDATA | UTF_SCAN_FDT); static int dm_test_i2c_reg_clrset(struct unit_test_state *uts) diff --git a/test/dm/mdio.c b/test/dm/mdio.c index 325b212282..6760c98898 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -53,5 +53,4 @@ static int dm_test_mdio(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_mdio, UTF_SCAN_FDT); diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index 864bc0c319..866feb2638 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -76,5 +76,4 @@ static int dm_test_mdio_mux(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_mdio_mux, UTF_SCAN_FDT); diff --git a/test/dm/memory.c b/test/dm/memory.c index 64ceb99f8d..34e64ba018 100644 --- a/test/dm/memory.c +++ b/test/dm/memory.c @@ -17,5 +17,4 @@ static int dm_test_memory(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_memory, UTF_SCAN_FDT); diff --git a/test/dm/misc.c b/test/dm/misc.c index 1abc9eee04..250885dcf5 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -79,5 +79,4 @@ static int dm_test_misc(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_misc, UTF_SCAN_FDT); diff --git a/test/dm/nop.c b/test/dm/nop.c index 7eac16703d..a6f5f820f6 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -69,5 +69,4 @@ static int dm_test_nop(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_nop, UTF_FLAT_TREE | UTF_SCAN_FDT); diff --git a/test/dm/nvmxip.c b/test/dm/nvmxip.c index 67e19f2a30..5c455ddbf0 100644 --- a/test/dm/nvmxip.c +++ b/test/dm/nvmxip.c @@ -142,5 +142,4 @@ static int dm_test_nvmxip(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - DM_TEST(dm_test_nvmxip, UTF_SCAN_FDT | UTF_CONSOLE_REC); diff --git a/test/dm/osd.c b/test/dm/osd.c index 5e77d3b526..5fb27a3d82 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -130,7 +130,6 @@ static int dm_test_osd_basics(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_osd_basics, UTF_SCAN_PDATA | UTF_SCAN_FDT); static int dm_test_osd_extended(struct unit_test_state *uts) @@ -214,5 +213,4 @@ static int dm_test_osd_extended(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_osd_extended, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index 244fefa40b..068b72a20c 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -59,5 +59,4 @@ static int dm_test_pci_ep_base(struct unit_test_state *uts) ut_asserteq(sandbox_get_pci_ep_irq_count(bus), 10); return 0; } - DM_TEST(dm_test_pci_ep_base, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/pmic.c b/test/dm/pmic.c index 146aedf8f9..70dd18f5df 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -52,7 +52,6 @@ static int dm_test_power_pmic_mc34708_get(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_power_pmic_mc34708_get, UTF_SCAN_FDT); /* Test PMIC I/O */ diff --git a/test/dm/qfw.c b/test/dm/qfw.c index a7dfe8f8da..b6be5c5baa 100644 --- a/test/dm/qfw.c +++ b/test/dm/qfw.c @@ -23,7 +23,6 @@ static int dm_test_qfw_cpus(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_qfw_cpus, UTF_SCAN_PDATA); static int dm_test_qfw_firmware_list(struct unit_test_state *uts) @@ -37,5 +36,4 @@ static int dm_test_qfw_firmware_list(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_qfw_firmware_list, UTF_SCAN_PDATA); diff --git a/test/dm/reboot-mode.c b/test/dm/reboot-mode.c index c5949092c5..9a3b2bf0a4 100644 --- a/test/dm/reboot-mode.c +++ b/test/dm/reboot-mode.c @@ -39,7 +39,6 @@ static int dm_test_reboot_mode_gpio(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_reboot_mode_gpio, UTF_PROBE_TEST | UTF_SCAN_FDT | UTF_FLAT_TREE); @@ -65,6 +64,5 @@ static int dm_test_reboot_mode_rtc(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_reboot_mode_rtc, UTF_PROBE_TEST | UTF_SCAN_FDT | UTF_FLAT_TREE); diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 436b711b85..5024b47c7a 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -157,7 +157,6 @@ static int dm_test_regmap_getset(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_regmap_getset, UTF_SCAN_PDATA | UTF_SCAN_FDT); /* Read polling test */ diff --git a/test/dm/reset.c b/test/dm/reset.c index 99f46fead6..dceb6a1dad 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -66,7 +66,6 @@ static int dm_test_reset_base(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_reset_base, UTF_SCAN_FDT); static int dm_test_reset(struct unit_test_state *uts) diff --git a/test/dm/scmi.c b/test/dm/scmi.c index 93e275e065..5c540fc058 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -202,7 +202,6 @@ static int dm_test_scmi_base(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_scmi_base, UTF_SCAN_FDT); static int dm_test_scmi_cmd(struct unit_test_state *uts) @@ -282,7 +281,6 @@ static int dm_test_scmi_cmd(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_scmi_cmd, UTF_SCAN_FDT); static int dm_test_scmi_power_domains(struct unit_test_state *uts) @@ -388,7 +386,6 @@ static int dm_test_scmi_power_domains(struct unit_test_state *uts) return release_sandbox_scmi_test_devices(uts, dev); } - DM_TEST(dm_test_scmi_power_domains, UTF_SCAN_FDT); static int dm_test_scmi_clocks(struct unit_test_state *uts) diff --git a/test/dm/serial.c b/test/dm/serial.c index 456799a9eb..4acb14f41b 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -87,5 +87,4 @@ static int dm_test_serial(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_serial, UTF_SCAN_FDT); diff --git a/test/dm/sm.c b/test/dm/sm.c index 30985717fe..cf4dab6a72 100644 --- a/test/dm/sm.c +++ b/test/dm/sm.c @@ -60,5 +60,4 @@ static int dm_test_sm(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_sm, UTF_SCAN_FDT); diff --git a/test/dm/soc.c b/test/dm/soc.c index c01b062970..a6b82e5376 100644 --- a/test/dm/soc.c +++ b/test/dm/soc.c @@ -115,5 +115,4 @@ static int dm_test_soc(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_soc, UTF_SCAN_FDT); diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c index adb2f366d2..6c0d2d7e4d 100644 --- a/test/dm/sysinfo.c +++ b/test/dm/sysinfo.c @@ -59,5 +59,4 @@ static int dm_test_sysinfo(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_sysinfo, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/tag.c b/test/dm/tag.c index bce8a35acf..1412171738 100644 --- a/test/dm/tag.c +++ b/test/dm/tag.c @@ -29,7 +29,6 @@ static int dm_test_tag_ptr(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_tag_ptr, 0); /* @@ -49,7 +48,6 @@ static int dm_test_tag_val(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_tag_val, 0); /* @@ -63,7 +61,6 @@ static int dm_test_tag_inval(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_tag_inval, 0); /* @@ -79,5 +76,4 @@ static int dm_test_tag_del_all(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_tag_del_all, 0); diff --git a/test/dm/tee.c b/test/dm/tee.c index fb890c1bdd..b56c982eb7 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -215,5 +215,4 @@ out: return rc; } - DM_TEST(dm_test_tee, UTF_SCAN_FDT); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index d9c49312f5..af8cd61710 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -1224,5 +1224,4 @@ static int dm_test_read_resource(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_read_resource, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/env/hashtable.c b/test/env/hashtable.c index ccdf0138c4..16e4935888 100644 --- a/test/env/hashtable.c +++ b/test/env/hashtable.c @@ -101,7 +101,6 @@ static int env_test_htab_fill(struct unit_test_state *uts) hdestroy_r(&htab); return 0; } - ENV_TEST(env_test_htab_fill, 0); /* Fill the hashtable up halfway an repeateadly delete/create elements @@ -122,5 +121,4 @@ static int env_test_htab_deletes(struct unit_test_state *uts) hdestroy_r(&htab); return 0; } - ENV_TEST(env_test_htab_deletes, 0); diff --git a/test/lib/asn1.c b/test/lib/asn1.c index 4842b7058a..f0c7819e40 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -135,7 +135,6 @@ static int lib_asn1_x509(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_asn1_x509, 0); #endif /* CONFIG_X509_CERTIFICATE_PARSER */ @@ -324,7 +323,6 @@ static int lib_asn1_pkcs7(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_asn1_pkcs7, 0); #endif /* CONFIG_PKCS7_MESSAGE_PARSER */ @@ -386,6 +384,5 @@ static int lib_asn1_pkey(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_asn1_pkey, 0); #endif /* CONFIG_RSA_PUBLIC_KEY_PARSER */ diff --git a/test/lib/efi_device_path.c b/test/lib/efi_device_path.c index 290c8768fa..5cc001e209 100644 --- a/test/lib/efi_device_path.c +++ b/test/lib/efi_device_path.c @@ -45,5 +45,4 @@ static int lib_test_efi_dp_check_length(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_efi_dp_check_length, 0); diff --git a/test/lib/efi_image_region.c b/test/lib/efi_image_region.c index 3ca49dc4a2..2102539ea7 100644 --- a/test/lib/efi_image_region.c +++ b/test/lib/efi_image_region.c @@ -65,7 +65,6 @@ static int lib_test_efi_image_region_add(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_efi_image_region_add, 0); static int lib_test_efi_image_region_sort(struct unit_test_state *uts) @@ -158,5 +157,4 @@ static int lib_test_efi_image_region_sort(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_efi_image_region_sort, 0); diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c index d531a83039..7b4592d175 100644 --- a/test/lib/hexdump.c +++ b/test/lib/hexdump.c @@ -31,7 +31,6 @@ static int lib_test_hex_to_bin(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_hex_to_bin, 0); static int lib_test_hex2bin(struct unit_test_state *uts) @@ -61,7 +60,6 @@ static int lib_test_hex2bin(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_hex2bin, 0); static int lib_test_bin2hex(struct unit_test_state *uts) @@ -91,5 +89,4 @@ static int lib_test_bin2hex(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_bin2hex, 0); diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 4b5b6e5e20..3c66138f73 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -360,7 +360,6 @@ static int lib_test_lmb_noreserved(struct unit_test_state *uts) /* simulate 512 MiB RAM beginning at 1.5GiB */ return test_noreserved(uts, 0xE0000000, 4, 1); } - LIB_TEST(lib_test_lmb_noreserved, 0); static int lib_test_lmb_unaligned_size(struct unit_test_state *uts) diff --git a/test/lib/rsa.c b/test/lib/rsa.c index 40f70010c7..129d03ab7d 100644 --- a/test/lib/rsa.c +++ b/test/lib/rsa.c @@ -158,7 +158,6 @@ static int lib_rsa_verify_valid(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_rsa_verify_valid, 0); /** @@ -200,6 +199,5 @@ static int lib_rsa_verify_invalid(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_rsa_verify_invalid, 0); #endif /* RSA_VERIFY_WITH_PKEY */ diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c index 9fe5521749..3a2ec8ffa5 100644 --- a/test/lib/sscanf.c +++ b/test/lib/sscanf.c @@ -169,5 +169,4 @@ static int lib_sscanf(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_sscanf, 0); diff --git a/test/lib/string.c b/test/lib/string.c index d08dbca929..8d22f3fd68 100644 --- a/test/lib/string.c +++ b/test/lib/string.c @@ -93,7 +93,6 @@ static int lib_memset(struct unit_test_state *uts) } return 0; } - LIB_TEST(lib_memset, 0); /** @@ -157,7 +156,6 @@ static int lib_memcpy(struct unit_test_state *uts) } return 0; } - LIB_TEST(lib_memcpy, 0); /** @@ -192,7 +190,6 @@ static int lib_memmove(struct unit_test_state *uts) } return 0; } - LIB_TEST(lib_memmove, 0); /** lib_memdup() - unit test for memdup() */ diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c index cfd9d8ca5a..6d9068c4f7 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -163,5 +163,4 @@ static int lib_test_aes(struct unit_test_state *uts) return ret; } - LIB_TEST(lib_test_aes, 0); diff --git a/test/lib/test_crc8.c b/test/lib/test_crc8.c index 0dac97bc5b..52be2dc06c 100644 --- a/test/lib/test_crc8.c +++ b/test/lib/test_crc8.c @@ -25,5 +25,4 @@ static int lib_crc8(struct unit_test_state *uts) { return 0; } - LIB_TEST(lib_crc8, 0); diff --git a/test/lib/test_crypt.c b/test/lib/test_crypt.c index dcdadd992c..b6dd5f07b8 100644 --- a/test/lib/test_crypt.c +++ b/test/lib/test_crypt.c @@ -59,5 +59,4 @@ static int lib_crypt(struct unit_test_state *uts) return CMD_RET_SUCCESS; } - LIB_TEST(lib_crypt, 0); diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c index 67f76442b2..967ecfd56f 100644 --- a/test/lib/test_errno_str.c +++ b/test/lib/test_errno_str.c @@ -41,5 +41,4 @@ static int lib_errno_str(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_errno_str, 0); diff --git a/test/lib/test_print.c b/test/lib/test_print.c index c7fc50a1de..e356afc22b 100644 --- a/test/lib/test_print.c +++ b/test/lib/test_print.c @@ -41,7 +41,6 @@ static int lib_test_print_freq(struct unit_test_state *uts) ut_assertok(test_print_freq(uts, 54321987654321, "54321.99 GHz;")); return 0; } - LIB_TEST(lib_test_print_freq, 0); static int test_print_size(struct unit_test_state *uts, @@ -74,5 +73,4 @@ static int lib_test_print_size(struct unit_test_state *uts) ut_assertok(test_print_size(uts, 54321987654321, "49.4 TiB;")); return 0; } - LIB_TEST(lib_test_print_size, 0); diff --git a/test/lib/uuid.c b/test/lib/uuid.c index 0914f2c47e..8fe65dbf78 100644 --- a/test/lib/uuid.c +++ b/test/lib/uuid.c @@ -36,5 +36,4 @@ static int lib_test_uuid_to_le(struct unit_test_state *uts) return 0; } - LIB_TEST(lib_test_uuid_to_le, 0);