[U-Boot] [PATCH v6 1/6] env: add the same prefix to error messages to make it detectable by tests
Quentin Schulz
quentin.schulz at bootlin.com
Mon Jul 9 17:16:25 UTC 2018
The error message should start with `## Error: ` so that it's easily
detectable by tests without needing to have a complex regexp for
matching all possible error message patterns.
Let's add the `## Error: ` prefix to the error messages since it's the
one already in use.
Suggested-by: Stephen Warren <swarren at wwwdotorg.org>
Signed-off-by: Quentin Schulz <quentin.schulz at bootlin.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Stephen Warren <swarren at nvidia.com>
Tested-by: Stephen Warren <swarren at nvidia.com>
---
added in v5
cmd/nvedit.c | 12 ++++++++----
env/common.c | 3 ++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index ddc888a..70d7068 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -959,7 +959,8 @@ NXTARG: ;
H_MATCH_KEY | H_MATCH_IDENT,
&ptr, size, argc, argv);
if (len < 0) {
- pr_err("Cannot export environment: errno = %d\n", errno);
+ pr_err("## Error: Cannot export environment: errno = %d\n",
+ errno);
return 1;
}
sprintf(buf, "%zX", (size_t)len);
@@ -979,7 +980,8 @@ NXTARG: ;
H_MATCH_KEY | H_MATCH_IDENT,
&res, ENV_SIZE, argc, argv);
if (len < 0) {
- pr_err("Cannot export environment: errno = %d\n", errno);
+ pr_err("## Error: Cannot export environment: errno = %d\n",
+ errno);
return 1;
}
@@ -994,7 +996,8 @@ NXTARG: ;
return 0;
sep_err:
- printf("## %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n", cmd);
+ printf("## Error: %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n",
+ cmd);
return 1;
}
#endif
@@ -1114,7 +1117,8 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
if (himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR,
crlf_is_lf, 0, NULL) == 0) {
- pr_err("Environment import failed: errno = %d\n", errno);
+ pr_err("## Error: Environment import failed: errno = %d\n",
+ errno);
return 1;
}
gd->flags |= GD_FLG_ENV_READY;
diff --git a/env/common.c b/env/common.c
index dc8a14f..7bd2790 100644
--- a/env/common.c
+++ b/env/common.c
@@ -83,7 +83,8 @@ void set_default_env(const char *s)
if (himport_r(&env_htab, (char *)default_environment,
sizeof(default_environment), '\0', flags, 0,
0, NULL) == 0)
- pr_err("Environment import failed: errno = %d\n", errno);
+ pr_err("## Error: Environment import failed: errno = %d\n",
+ errno);
gd->flags |= GD_FLG_ENV_READY;
gd->flags |= GD_FLG_ENV_DEFAULT;
base-commit: 22d58e60ffb5484d912f26b9c3533eff1d3d3de9
--
git-series 0.9.1
More information about the U-Boot
mailing list