Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 09:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Move print_ut into the common suite

Browse source 
There is no particular need for bloblist to have its own test suite.
Move it into the common suite instead.

Add the missing help for 'common'.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Rini <trini@konsulko.com> # rpi_3, rpi_4, rpi_arm64, am64x_evm_a53, am64-sk
This commit is contained in:
Simon Glass 2024-11-02 13:36:56 -06:00 • committed by Tom Rini
parent 479b389c3d
commit 33ca12b233
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/cmd_ut.c
View file

@ -99,7 +99,6 @@ static struct cmd_tbl cmd_ut_sub[] = {
U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "",
""),
#endif
U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_ut_print, "", ""),
#ifdef CONFIG_UT_TIME
U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""),
#endif
@ -205,6 +204,7 @@ U_BOOT_LONGHELP(ut,
#ifdef CONFIG_CMDLINE
"\ncmd - test various commands"
#endif
"\ncommon - tests for common/ directory"
#ifdef CONFIG_UT_DM
"\ndm - driver model"
#endif
@ -239,7 +239,6 @@ U_BOOT_LONGHELP(ut,
#ifdef CONFIG_CMD_PCI_MPS
"\npci_mps - PCI Express Maximum Payload Size"
#endif
"\nprint - printing things to the console"
"\nsetexpr - setexpr command"
#ifdef CONFIG_SANDBOX
"\nstr - basic test of string functions"

27
test/common/print.c
View file

@ -11,7 +11,7 @@
#include <version_string.h>
#include <stdio.h>
#include <vsprintf.h>
#include <test/suites.h>
#include <test/common.h>
#include <test/test.h>
#include <test/ut.h>
@ -20,9 +20,6 @@
#define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
"and a lot more text to come"
/* Declare a new print test */
#define PRINT_TEST(_name, _flags) UNIT_TEST(_name, _flags, print_test)
#if CONFIG_IS_ENABLED(LIB_UUID)
/* Test printing GUIDs */
static int print_guid(struct unit_test_state *uts)
@ -59,7 +56,7 @@ static int print_guid(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_guid, 0);
COMMON_TEST(print_guid, 0);
#endif
#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
@ -95,7 +92,7 @@ static int print_efi_ut(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_efi_ut, 0);
COMMON_TEST(print_efi_ut, 0);
#endif
static int print_printf(struct unit_test_state *uts)
@ -163,7 +160,7 @@ static int print_printf(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_printf, 0);
COMMON_TEST(print_printf, 0);
static int print_display_buffer(struct unit_test_state *uts)
{
@ -238,7 +235,7 @@ static int print_display_buffer(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_display_buffer, UTF_CONSOLE);
COMMON_TEST(print_display_buffer, UTF_CONSOLE);
static int print_hexdump_line(struct unit_test_state *uts)
{
@ -264,7 +261,7 @@ static int print_hexdump_line(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_hexdump_line, UTF_CONSOLE);
COMMON_TEST(print_hexdump_line, UTF_CONSOLE);
static int print_do_hex_dump(struct unit_test_state *uts)
{
@ -350,7 +347,7 @@ static int print_do_hex_dump(struct unit_test_state *uts)
return 0;
}
PRINT_TEST(print_do_hex_dump, UTF_CONSOLE);
COMMON_TEST(print_do_hex_dump, UTF_CONSOLE);
static int snprint(struct unit_test_state *uts)
{
@ -376,12 +373,4 @@ static int snprint(struct unit_test_state *uts)
ut_asserteq(8, ret);
return 0;
}
PRINT_TEST(snprint, 0);
int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
struct unit_test *tests = UNIT_TEST_SUITE_START(print_test);
const int n_ents = UNIT_TEST_SUITE_COUNT(print_test);
return cmd_ut_category("print", "print_", tests, n_ents, argc, argv);
}
COMMON_TEST(snprint, 0);