colibri_imx6: fix video stdout in default environment

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

diff --git a/test/str_ut.c b/test/str_ut.c
index fab8de595cbf7cf7b2a3e92f9c9acf429daff5e7..ef1205dbbd0fedc62d784c87bf4b413fb61a12fa 100644 (file)
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -19,36 +19,84 @@ static const char str3[] = "0xbI'm sorry you're alive.";
 /* Declare a new str test */
 #define STR_TEST(_name, _flags)                UNIT_TEST(_name, _flags, str_test)
 
+static int str_test_upper(struct unit_test_state *uts)
+{
+       char out[TEST_STR_SIZE];
+
+       /* Make sure it adds a terminator */
+       out[strlen(str1)] = 'a';
+       str_to_upper(str1, out, SIZE_MAX);
+       ut_asserteq_str("I'M SORRY I'M LATE.", out);
+
+       /* In-place operation */
+       strcpy(out, str2);
+       str_to_upper(out, out, SIZE_MAX);
+       ut_asserteq_str("1099ABNO, DON'T BOTHER APOLOGISING.", out);
+
+       /* Limited length */
+       str_to_upper(str1, out, 7);
+       ut_asserteq_str("I'M SORO, DON'T BOTHER APOLOGISING.", out);
+
+       /* In-place with limited length */
+       strcpy(out, str2);
+       str_to_upper(out, out, 7);
+       ut_asserteq_str("1099ABNo, don't bother apologising.", out);
+
+       /* Copy an empty string to a buffer with space*/
+       out[1] = 0x7f;
+       str_to_upper("", out, SIZE_MAX);
+       ut_asserteq('\0', *out);
+       ut_asserteq(0x7f, out[1]);
+
+       /* Copy an empty string to a buffer with no space*/
+       out[0] = 0x7f;
+       str_to_upper("", out, 0);
+       ut_asserteq(0x7f, out[0]);
+
+       return 0;
+}
+STR_TEST(str_test_upper, 0);
+
 static int run_strtoul(struct unit_test_state *uts, const char *str, int base,
-                      ulong expect_val, int expect_endp_offset)
+                      ulong expect_val, int expect_endp_offset, bool upper)
 {
+       char out[TEST_STR_SIZE];
        char *endp;
        ulong val;
 
-       val = simple_strtoul(str, &endp, base);
+       strcpy(out, str);
+       if (upper)
+               str_to_upper(out, out, -1);
+
+       val = simple_strtoul(out, &endp, base);
        ut_asserteq(expect_val, val);
-       ut_asserteq(expect_endp_offset, endp - str);
+       ut_asserteq(expect_endp_offset, endp - out);
 
        return 0;
 }
 
 static int str_simple_strtoul(struct unit_test_state *uts)
 {
-       /* Base 10 and base 16 */
-       ut_assertok(run_strtoul(uts, str2, 10, 1099, 4));
-       ut_assertok(run_strtoul(uts, str2, 16, 0x1099ab, 6));
+       int upper;
+
+       /* Check that it is case-insentive */
+       for (upper = 0; upper < 2; upper++) {
+               /* Base 10 and base 16 */
+               ut_assertok(run_strtoul(uts, str2, 10, 1099, 4, upper));
+               ut_assertok(run_strtoul(uts, str2, 16, 0x1099ab, 6, upper));
 
-       /* Invalid string */
-       ut_assertok(run_strtoul(uts, str1, 10, 0, 0));
+               /* Invalid string */
+               ut_assertok(run_strtoul(uts, str1, 10, 0, 0, upper));
 
-       /* Base 0 */
-       ut_assertok(run_strtoul(uts, str1, 0, 0, 0));
-       ut_assertok(run_strtoul(uts, str2, 0, 1099, 4));
-       ut_assertok(run_strtoul(uts, str3, 0, 0xb, 3));
+               /* Base 0 */
+               ut_assertok(run_strtoul(uts, str1, 0, 0, 0, upper));
+               ut_assertok(run_strtoul(uts, str2, 0, 1099, 4, upper));
+               ut_assertok(run_strtoul(uts, str3, 0, 0xb, 3, upper));
 
-       /* Base 2 */
-       ut_assertok(run_strtoul(uts, str1, 2, 0, 0));
-       ut_assertok(run_strtoul(uts, str2, 2, 2, 2));
+               /* Base 2 */
+               ut_assertok(run_strtoul(uts, str1, 2, 0, 0, upper));
+               ut_assertok(run_strtoul(uts, str2, 2, 2, 2, upper));
+       }
 
        /* Check endp being NULL */
        ut_asserteq(1099, simple_strtoul(str2, NULL, 0));
@@ -57,7 +105,7 @@ static int str_simple_strtoul(struct unit_test_state *uts)
 }
 STR_TEST(str_simple_strtoul, 0);
 
-int do_ut_str(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        struct unit_test *tests = ll_entry_start(struct unit_test,
                                                 str_test);