diff mbox series

[v2,2/4] unit-test: cover run_commandf() by test-cases

Message ID 20230320082314.2018-3-EABachinin@sberdevices.ru
State Accepted
Commit dd1f34a9b9a0fa7e10fef05641f54955006565e3
Delegated to: Tom Rini
Headers show
Series cli: run_commandf() coverage and small fixups | expand

Commit Message

Evgeny Bachinin March 20, 2023, 8:23 a.m. UTC 
As run_commandf() is variadic version of run_command() and just a wrapper,
hence apply similar run_command's test-cases.

Let's avoid warning about empty string passing:
warning: zero-length gnu_printf format string [-Wformat-zero-length]
   assert(run_commandf("") == 0);

Signed-off-by: Evgeny Bachinin <EABachinin@sberdevices.ru>
---
Changes for v2:
- s/EINVAL/ENOSPC/
- rewrite test-case for truncation case
- not apply Reviewed-by due to changes above

 test/command_ut.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Comments

Simon Glass March 20, 2023, 6:40 p.m. UTC | #1 
On Mon, 20 Mar 2023 at 21:23, Evgeny Bachinin <EABachinin@sberdevices.ru> wrote:
>
> As run_commandf() is variadic version of run_command() and just a wrapper,
> hence apply similar run_command's test-cases.
>
> Let's avoid warning about empty string passing:
> warning: zero-length gnu_printf format string [-Wformat-zero-length]
>    assert(run_commandf("") == 0);
>
> Signed-off-by: Evgeny Bachinin <EABachinin@sberdevices.ru>
> ---
> Changes for v2:
> - s/EINVAL/ENOSPC/
> - rewrite test-case for truncation case
> - not apply Reviewed-by due to changes above
>
>  test/command_ut.c | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini March 31, 2023, 2:15 p.m. UTC | #2 
On Mon, Mar 20, 2023 at 11:23:12AM +0300, Evgeny Bachinin wrote:

> As run_commandf() is variadic version of run_command() and just a wrapper,
> hence apply similar run_command's test-cases.
> 
> Let's avoid warning about empty string passing:
> warning: zero-length gnu_printf format string [-Wformat-zero-length]
>    assert(run_commandf("") == 0);
> 
> Signed-off-by: Evgeny Bachinin <EABachinin@sberdevices.ru>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/test/command_ut.c b/test/command_ut.c
index 9837d10eb5..a74bd109e1 100644
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -9,6 +9,8 @@ 
 #include <command.h>
 #include <env.h>
 #include <log.h>
+#include <string.h>
+#include <linux/errno.h>
 
 static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
 		"setenv list ${list}3\0"
@@ -17,6 +19,8 @@  static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
 static int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
 		     char *const argv[])
 {
+	char long_str[CONFIG_SYS_CBSIZE + 42];
+
 	printf("%s: Testing commands\n", __func__);
 	run_command("env default -f -a", 0);
 
@@ -60,6 +64,36 @@  static int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
 
 	assert(run_command("'", 0) == 1);
 
+	/* Variadic function test-cases */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-zero-length"
+	assert(run_commandf("") == 0);
+#pragma GCC diagnostic pop
+	assert(run_commandf(" ") == 0);
+	assert(run_commandf("'") == 1);
+
+	assert(run_commandf("env %s %s", "delete -f", "list") == 0);
+	/* Expected: "Error: "list" not defined" */
+	assert(run_commandf("printenv list") == 1);
+
+	memset(long_str, 'x', sizeof(long_str));
+	assert(run_commandf("Truncation case: %s", long_str) == -ENOSPC);
+
+	if (IS_ENABLED(CONFIG_HUSH_PARSER)) {
+		assert(run_commandf("env %s %s %s %s", "delete -f", "adder",
+				    "black", "foo") == 0);
+		assert(run_commandf("setenv foo 'setenv %s 1\nsetenv %s 2'",
+				    "black", "adder") == 0);
+		run_command("run foo", 0);
+		assert(env_get("black"));
+		assert(!strcmp("1", env_get("black")));
+		assert(env_get("adder"));
+		assert(!strcmp("2", env_get("adder")));
+	}
+
+	/* Clean up before exit */
+	run_command("env default -f -a", 0);
+
 	printf("%s: Everything went swimmingly\n", __func__);
 	return 0;
 }