leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Convert print tests to use ut framework

Browse Source 
This test predates the test framework in U-Boot. It uses #define DEBUG and
assert() to check the result. Update it to use the framework so it can
report failure constitent with other tests.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-05-08 06:59:58 -06:00
committed by Tom Rini
parent 090d664eac
commit fbb99dcec0
3 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/test/suites.h
View File

@@ -41,6 +41,7 @@ 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[]); 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, int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]); char *const argv[]);
int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc, int do_ut_setexpr(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]); char *const argv[]);
int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

2
test/cmd_ut.c
View File

@@ -51,6 +51,7 @@ static struct cmd_tbl cmd_ut_sub[] = {
U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "", U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "",
""), ""),
#endif #endif
U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_ut_print, "", ""),
#ifdef CONFIG_UT_TIME #ifdef CONFIG_UT_TIME
U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""), U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""),
#endif #endif
@@ -132,6 +133,7 @@ static char ut_help_text[] =
#ifdef CONFIG_UT_OVERLAY #ifdef CONFIG_UT_OVERLAY
"ut overlay [test-name]\n" "ut overlay [test-name]\n"
#endif #endif
"ut print [test-name] - test printing\n"
"ut setexpr [test-name] - test setexpr command\n" "ut setexpr [test-name] - test setexpr command\n"
#ifdef CONFIG_SANDBOX #ifdef CONFIG_SANDBOX
"ut str - Basic test of string functions\n" "ut str - Basic test of string functions\n"

113
test/print_ut.c
View File

@@ -3,42 +3,49 @@
* Copyright (c) 2012, The Chromium Authors * Copyright (c) 2012, The Chromium Authors
*/ */
#define DEBUG
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <efi_api.h> #include <efi_api.h>
#include <display_options.h> #include <display_options.h>
#include <log.h> #include <log.h>
#include <version.h> #include <version.h>
#include <test/suites.h>
#include <test/test.h>
#include <test/ut.h>
#define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \ #define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
"and a lot more text to come" "and a lot more text to come"
/* Test printing GUIDs */ /* Declare a new print test */
static void guid_ut_print(void) #define PRINT_TEST(_name, _flags) UNIT_TEST(_name, _flags, print_test)
{
#if CONFIG_IS_ENABLED(LIB_UUID) #if CONFIG_IS_ENABLED(LIB_UUID)
/* Test printing GUIDs */
static int print_guid(struct unit_test_state *uts)
{
unsigned char guid[16] = { unsigned char guid[16] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
}; };
char str[40]; char str[40];
sprintf(str, "%pUb", guid); sprintf(str, "%pUb", guid);
assert(!strcmp("01020304-0506-0708-090a-0b0c0d0e0f10", str)); ut_assertok(strcmp("01020304-0506-0708-090a-0b0c0d0e0f10", str));
sprintf(str, "%pUB", guid); sprintf(str, "%pUB", guid);
assert(!strcmp("01020304-0506-0708-090A-0B0C0D0E0F10", str)); ut_assertok(strcmp("01020304-0506-0708-090A-0B0C0D0E0F10", str));
sprintf(str, "%pUl", guid); sprintf(str, "%pUl", guid);
assert(!strcmp("04030201-0605-0807-090a-0b0c0d0e0f10", str)); ut_assertok(strcmp("04030201-0605-0807-090a-0b0c0d0e0f10", str));
sprintf(str, "%pUL", guid); sprintf(str, "%pUL", guid);
assert(!strcmp("04030201-0605-0807-090A-0B0C0D0E0F10", str)); ut_assertok(strcmp("04030201-0605-0807-090A-0B0C0D0E0F10", str));
#endif
} return 0;
}
PRINT_TEST(print_guid, 0);
#endif
/* Test efi_loader specific printing */
static void efi_ut_print(void)
{
#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) #if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
/* Test efi_loader specific printing */
static int print_efi_ut(struct unit_test_state *uts)
{
char str[10]; char str[10];
u8 buf[sizeof(struct efi_device_path_sd_mmc_path) + u8 buf[sizeof(struct efi_device_path_sd_mmc_path) +
sizeof(struct efi_device_path)]; sizeof(struct efi_device_path)];
@@ -60,92 +67,88 @@ static void efi_ut_print(void)
dp_end->length = sizeof(struct efi_device_path); dp_end->length = sizeof(struct efi_device_path);
snprintf(str, sizeof(str), "_%pD_", buf); snprintf(str, sizeof(str), "_%pD_", buf);
assert(!strcmp("_/SD(3)_", str)); ut_assertok(strcmp("_/SD(3)_", str));
/* NULL device path */ /* NULL device path */
snprintf(str, sizeof(str), "_%pD_", NULL); snprintf(str, sizeof(str), "_%pD_", NULL);
assert(!strcmp("_<NULL>_", str)); ut_assertok(strcmp("_<NULL>_", str));
#endif
}
static int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, return 0;
char *const argv[]) }
PRINT_TEST(print_efi_ut, 0);
#endif
static int print_printf(struct unit_test_state *uts)
{ {
char big_str[400]; char big_str[400];
int big_str_len; int big_str_len;
char str[10], *s; char str[10], *s;
int len; int len;
printf("%s: Testing print\n", __func__);
snprintf(str, sizeof(str), "testing"); snprintf(str, sizeof(str), "testing");
assert(!strcmp("testing", str)); ut_assertok(strcmp("testing", str));
snprintf(str, sizeof(str), "testing but too long"); snprintf(str, sizeof(str), "testing but too long");
assert(!strcmp("testing b", str)); ut_assertok(strcmp("testing b", str));
snprintf(str, 1, "testing none"); snprintf(str, 1, "testing none");
assert(!strcmp("", str)); ut_assertok(strcmp("", str));
*str = 'x'; *str = 'x';
snprintf(str, 0, "testing none"); snprintf(str, 0, "testing none");
assert(*str == 'x'); ut_asserteq('x', *str);
sprintf(big_str, "_%ls_", L"foo"); sprintf(big_str, "_%ls_", L"foo");
assert(!strcmp("_foo_", big_str)); ut_assertok(strcmp("_foo_", big_str));
/* Test the banner function */ /* Test the banner function */
s = display_options_get_banner(true, str, sizeof(str)); s = display_options_get_banner(true, str, sizeof(str));
assert(s == str); ut_asserteq_ptr(str, s);
assert(!strcmp("\n\nU-Boo\n\n", s)); ut_assertok(strcmp("\n\nU-Boo\n\n", s));
/* Assert that we do not overwrite memory before the buffer */ /* Assert that we do not overwrite memory before the buffer */
str[0] = '`'; str[0] = '`';
s = display_options_get_banner(true, str + 1, 1); s = display_options_get_banner(true, str + 1, 1);
assert(s == str + 1); ut_asserteq_ptr(str + 1, s);
assert(!strcmp("`", str)); ut_assertok(strcmp("`", str));
str[0] = '~'; str[0] = '~';
s = display_options_get_banner(true, str + 1, 2); s = display_options_get_banner(true, str + 1, 2);
assert(s == str + 1); ut_asserteq_ptr(str + 1, s);
assert(!strcmp("~\n", str)); ut_assertok(strcmp("~\n", str));
/* The last two characters are set to \n\n for all buffer sizes > 2 */ /* The last two characters are set to \n\n for all buffer sizes > 2 */
s = display_options_get_banner(false, str, sizeof(str)); s = display_options_get_banner(false, str, sizeof(str));
assert(s == str); ut_asserteq_ptr(str, s);
assert(!strcmp("U-Boot \n\n", s)); ut_assertok(strcmp("U-Boot \n\n", s));
/* Give it enough space for some of the version */ /* Give it enough space for some of the version */
big_str_len = strlen(version_string) - 5; big_str_len = strlen(version_string) - 5;
s = display_options_get_banner_priv(false, FAKE_BUILD_TAG, big_str, s = display_options_get_banner_priv(false, FAKE_BUILD_TAG, big_str,
big_str_len); big_str_len);
assert(s == big_str); ut_asserteq_ptr(big_str, s);
assert(!strncmp(version_string, s, big_str_len - 3)); ut_assertok(strncmp(version_string, s, big_str_len - 3));
assert(!strcmp("\n\n", s + big_str_len - 3)); ut_assertok(strcmp("\n\n", s + big_str_len - 3));
/* Give it enough space for the version and some of the build tag */ /* Give it enough space for the version and some of the build tag */
big_str_len = strlen(version_string) + 9 + 20; big_str_len = strlen(version_string) + 9 + 20;
s = display_options_get_banner_priv(false, FAKE_BUILD_TAG, big_str, s = display_options_get_banner_priv(false, FAKE_BUILD_TAG, big_str,
big_str_len); big_str_len);
assert(s == big_str); ut_asserteq_ptr(big_str, s);
len = strlen(version_string); len = strlen(version_string);
assert(!strncmp(version_string, s, len)); ut_assertok(strncmp(version_string, s, len));
assert(!strncmp(", Build: ", s + len, 9)); ut_assertok(strncmp(", Build: ", s + len, 9));
assert(!strncmp(FAKE_BUILD_TAG, s + 9 + len, 12)); ut_assertok(strncmp(FAKE_BUILD_TAG, s + 9 + len, 12));
assert(!strcmp("\n\n", s + big_str_len - 3)); ut_assertok(strcmp("\n\n", s + big_str_len - 3));
/* Test efi_loader specific printing */
efi_ut_print();
/* Test printing GUIDs */
guid_ut_print();
printf("%s: Everything went swimmingly\n", __func__);
return 0; return 0;
} }
PRINT_TEST(print_printf, 0);
U_BOOT_CMD( int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
ut_print, 1, 1, do_ut_print, {
"Very basic test of printf(), etc.", 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);
}