Subtree merge tag 'v6.8-dts' of devicetree-rebasing repo [1] into dts/upstream

[u-boot.git] / test / command_ut.c

diff --git a/test/command_ut.c b/test/command_ut.c
index 21283eb35732568abd464f10a1d8fa32aac3f931..a74bd109e153edcd68160660fee2d777be7daa09 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -1,34 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, The Chromium Authors
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #define DEBUG
 
 #include <common.h>
+#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"
                "setenv list ${list}4";
 
-static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+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);
 
        /* commands separated by \n */
        run_command_list("setenv list 1\n setenv list ${list}1", -1, 0);
-       assert(!strcmp("11", getenv("list")));
+       assert(!strcmp("11", env_get("list")));
 
        /* command followed by \n and nothing else */
        run_command_list("setenv list 1${list}\n", -1, 0);
-       assert(!strcmp("111", getenv("list")));
+       assert(!strcmp("111", env_get("list")));
 
        /* a command string with \0 in it. Stuff after \0 should be ignored */
        run_command("setenv list", 0);
        run_command_list(test_cmd, sizeof(test_cmd), 0);
-       assert(!strcmp("123", getenv("list")));
+       assert(!strcmp("123", env_get("list")));
 
        /*
         * a command list where we limit execution to only the first command
@@ -36,7 +43,7 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
         */
        run_command_list("setenv list 1\n setenv list ${list}2; "
                "setenv list ${list}3", strlen("setenv list 1"), 0);
-       assert(!strcmp("1", getenv("list")));
+       assert(!strcmp("1", env_get("list")));
 
        assert(run_command("false", 0) == 1);
        assert(run_command("echo", 0) == 0);
@@ -46,10 +53,10 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_HUSH_PARSER
        run_command("setenv foo 'setenv black 1\nsetenv adder 2'", 0);
        run_command("run foo", 0);
-       assert(getenv("black") != NULL);
-       assert(!strcmp("1", getenv("black")));
-       assert(getenv("adder") != NULL);
-       assert(!strcmp("2", getenv("adder")));
+       assert(env_get("black") != NULL);
+       assert(!strcmp("1", env_get("black")));
+       assert(env_get("adder") != NULL);
+       assert(!strcmp("2", env_get("adder")));
 #endif
 
        assert(run_command("", 0) == 0);
@@ -57,6 +64,36 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        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;
 }