summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2024-08-22 07:57:47 -0600
committerTom Rini <[email protected]>2024-08-26 18:51:48 -0600
commit88ae69f3b7efaa8de5c9d5d50081d6bf83e77ae9 (patch)
treecc444f6574edb3606eb081be33251cd634a95c2b /common
parentab84ffccd6c2a28a04feed8f17206a68e3adb928 (diff)
test: Fail when an empty line is expected but not present
The existing implementation of ut_assert_nextline_empty() cannot distinguish between an empty line and no line at all. It can in fact be called at the end of the recorded output and will happily return success. Adjust the logic so that this condition is detected. Show a failure message in this case. Fix the one test which falls foul of this fix. Signed-off-by: Simon Glass <[email protected]> Fixes: 400175b0a7d ("test: Add a way to check each line of console...") Reviewed-by: Mattijs Korpershoek <[email protected]>
Diffstat (limited to 'common')
-rw-r--r--common/console.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c
index 63f78004fdb..85f627297ed 100644
--- a/common/console.c
+++ b/common/console.c
@@ -845,6 +845,8 @@ int console_record_readline(char *str, int maxlen)
{
if (gd->flags & GD_FLG_RECORD_OVF)
return -ENOSPC;
+ if (console_record_isempty())
+ return -ENOENT;
return membuff_readline((struct membuff *)&gd->console_out, str,
maxlen, '\0', false);