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

console: Report an error when output buffer is exhausted

Browse Source 
If the console output buffer is exhausted, characters are silently dropped
from the end. Detect this condition and report an error when reading back
the characters.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-05-08 06:59:56 -06:00
committed by Tom Rini
parent 24e1e8841c
commit c1a2bb4f83
4 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/ut.c
View File

@@ -51,14 +51,31 @@ long ut_check_delta(ulong last)
return ut_check_free() - last;
}
static int readline_check(struct unit_test_state *uts)
{
int ret;
ret = console_record_readline(uts->actual_str, sizeof(uts->actual_str));
if (ret == -ENOSPC) {
ut_fail(uts, __FILE__, __LINE__, __func__,
"Console record buffer too small - increase CONFIG_CONSOLE_RECORD_OUT_SIZE");
return ret;
}
return 0;
}
int ut_check_console_line(struct unit_test_state *uts, const char *fmt, ...)
{
va_list args;
int ret;
va_start(args, fmt);
vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args);
va_end(args);
console_record_readline(uts->actual_str, sizeof(uts->actual_str));
ret = readline_check(uts);
if (ret < 0)
return ret;
return strcmp(uts->expect_str, uts->actual_str);
}
@@ -66,11 +83,14 @@ int ut_check_console_line(struct unit_test_state *uts, const char *fmt, ...)
int ut_check_console_linen(struct unit_test_state *uts, const char *fmt, ...)
{
va_list args;
int ret;
va_start(args, fmt);
vsnprintf(uts->expect_str, sizeof(uts->expect_str), fmt, args);
va_end(args);
console_record_readline(uts->actual_str, sizeof(uts->actual_str));
ret = readline_check(uts);
if (ret < 0)
return ret;
return strncmp(uts->expect_str, uts->actual_str,
strlen(uts->expect_str));
@@ -78,19 +98,26 @@ int ut_check_console_linen(struct unit_test_state *uts, const char *fmt, ...)
int ut_check_skipline(struct unit_test_state *uts)
{
int ret;
if (!console_record_avail())
return -ENFILE;
console_record_readline(uts->actual_str, sizeof(uts->actual_str));
ret = readline_check(uts);
if (ret < 0)
return ret;
return 0;
}
int ut_check_console_end(struct unit_test_state *uts)
{
int ret;
if (!console_record_avail())
return 0;
console_record_readline(uts->actual_str, sizeof(uts->actual_str));
ret = readline_check(uts);
if (ret < 0)
return ret;
return 1;
}