common: Drop linux/delay.h from common header

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

diff --git a/test/command_ut.c b/test/command_ut.c
index dfddc22d99d230184471ca891b2a3fe8169bf1aa..9837d10eb5c95d8cb689d819367d2cb36e205f96 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -1,70 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, The Chromium Authors
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #define DEBUG
 
 #include <common.h>
+#include <command.h>
+#include <env.h>
+#include <log.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[])
 {
        printf("%s: Testing commands\n", __func__);
-       run_command("env default -f", 0);
-
-       /* run a single command */
-       run_command("setenv single 1", 0);
-       assert(!strcmp("1", getenv("single")));
-
-       /* make sure that compound statements work */
-#ifdef CONFIG_SYS_HUSH_PARSER
-       run_command("if test -n ${single} ; then setenv check 1; fi", 0);
-       assert(!strcmp("1", getenv("check")));
-       run_command("setenv check", 0);
-#endif
-
-       /* commands separated by ; */
-       run_command_list("setenv list 1; setenv list ${list}1", -1, 0);
-       assert(!strcmp("11", getenv("list")));
+       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")));
-
-       /* three commands in a row */
-       run_command_list("setenv list 1\n setenv list ${list}2; "
-               "setenv list ${list}3", -1, 0);
-       assert(!strcmp("123", 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
@@ -72,7 +39,26 @@ 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);
+       assert(run_command_list("false", -1, 0) == 1);
+       assert(run_command_list("echo", -1, 0) == 0);
+
+#ifdef CONFIG_HUSH_PARSER
+       run_command("setenv foo 'setenv black 1\nsetenv adder 2'", 0);
+       run_command("run foo", 0);
+       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);
+       assert(run_command(" ", 0) == 0);
+
+       assert(run_command("'", 0) == 1);
 
        printf("%s: Everything went swimmingly\n", __func__);
        return 0;