Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

[karo-tx-uboot.git] / test / command_ut.c

diff --git a/test/command_ut.c b/test/command_ut.c
index b6b6976616156cbcb29a972cc1f6d7c2d39f7b79..ae6466d0ed8340fc64d833bdf29a618896e80d04 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -7,6 +7,9 @@
 #define DEBUG
 
 #include <common.h>
+#ifdef CONFIG_SANDBOX
+#include <os.h>
+#endif
 
 static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
                "setenv list ${list}3\0"
@@ -58,6 +61,11 @@ 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
        /* Test the 'test' command */
 
@@ -156,12 +164,13 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        setenv("ut_var_test", NULL);
 
 #ifdef CONFIG_SANDBOX
-       /*
-        * File existence
-        * This assume U-Boot sandbox is run from the U-Boot build directory
-        */
-       HUSH_TEST(e, "-e host - u-boot", y);
-       HUSH_TEST(e, "-e host - creating_this_file_breaks_uboot_unit_test", n);
+       /* File existence */
+       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", n);
+       run_command("sb save hostfs - creating_this_file_breaks_uboot_unit_test 0 1", 0);
+       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", y);
+       /* Perhaps this could be replaced by an "rm" shell command one day */
+       assert(!os_unlink("creating_this_file_breaks_uboot_unit_test"));
+       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", n);
 #endif
 #endif