X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=test%2Fcommand_ut.c;h=926573a39543c816281a879922ce9ca4c83dd3b1;hb=HEAD;hp=620a297d45ac3e3b3d051b580b76c817b2e4c301;hpb=4c89a369c7cd6e7ad3adec4601cfa69fec476164;p=karo-tx-uboot.git

diff --git a/test/command_ut.c b/test/command_ut.c
index 620a297d45..926573a395 100644
--- 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,14 +61,34 @@ 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);
+
+	run_command("setenv foo 'setenv monty 1; setenv python 2'", 0);
+	run_command("run foo", 0);
+	assert(getenv("monty") != NULL);
+	assert(!strcmp("1", getenv("monty")));
+	assert(getenv("python") != NULL);
+	assert(!strcmp("2", getenv("python")));
+
 #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")));
+
 	/* Test the 'test' command */
 
 #define HUSH_TEST(name, expr, expected_result) \
 	run_command("if test " expr " ; then " \
 			"setenv " #name "_" #expected_result " y; else " \
 			"setenv " #name "_" #expected_result " n; fi", 0); \
-	assert(!strcmp(#expected_result, getenv(#name "_" #expected_result)));
+	assert(!strcmp(#expected_result, getenv(#name "_" #expected_result))); \
+	setenv(#name "_" #expected_result, NULL);
 
 	/* Basic operators */
 	HUSH_TEST(streq, "aaa = aaa", y);
@@ -137,16 +160,39 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	HUSH_TEST(or_1_0_inv_inv, "! ! aaa = aaa -o ! ! bbb != bbb", y);
 	HUSH_TEST(or_1_1_inv_inv, "! ! aaa = aaa -o ! ! bbb = bbb", y);
 
+	setenv("ut_var_nonexistent", NULL);
+	setenv("ut_var_exists", "1");
+	HUSH_TEST(z_varexp_quoted, "-z \"$ut_var_nonexistent\"", y);
+	HUSH_TEST(z_varexp_quoted, "-z \"$ut_var_exists\"", n);
+	setenv("ut_var_exists", NULL);
+
+	run_command("setenv ut_var_space \" \"", 0);
+	assert(!strcmp(getenv("ut_var_space"), " "));
+	run_command("setenv ut_var_test $ut_var_space", 0);
+	assert(!getenv("ut_var_test"));
+	run_command("setenv ut_var_test \"$ut_var_space\"", 0);
+	assert(!strcmp(getenv("ut_var_test"), " "));
+	run_command("setenv ut_var_test \" 1${ut_var_space}${ut_var_space} 2 \"", 0);
+	assert(!strcmp(getenv("ut_var_test"), " 1   2 "));
+	setenv("ut_var_space", NULL);
+	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
 
+	assert(run_command("", 0) == 0);
+	assert(run_command(" ", 0) == 0);
+
+	assert(run_command("'", 0) == 1);
+
 	printf("%s: Everything went swimmingly\n", __func__);
 	return 0;
 }