test/py: Add support for loading image via tftp to specified location

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

diff --git a/test/command_ut.c b/test/command_ut.c
index 0e83db0cca0ecadc8f8380bc210b9882a5a41eef..54bf62b9bc301a5e1c2bdfa0be8224d33852acda 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -15,22 +15,7 @@ static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
 static int do_ut_cmd(cmd_tbl_t *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);
@@ -40,11 +25,6 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        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")));
-
        /* 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);
@@ -58,6 +38,25 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                "setenv list ${list}3", strlen("setenv list 1"), 0);
        assert(!strcmp("1", getenv("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_SYS_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")));
+#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;
 }