hush: fix some quoted variable expansion issues

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

diff --git a/test/command_ut.c b/test/command_ut.c
index 620a297d45ac3e3b3d051b580b76c817b2e4c301..b6b6976616156cbcb29a972cc1f6d7c2d39f7b79 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -65,7 +65,8 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        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,6 +138,23 @@ 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