test: Add the beginnings of some string tests

There are quite a few string functions in U-Boot with no tests. Make a
start by adding a test for strtoul().

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/test/suites.h b/include/test/suites.h
index 39ad81a90f9dd6ef4b6a5e2daacc71adc6f0c12a..213e3cee77f2c374edbdf530a51deb2762a254a0 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -33,6 +33,7 @@ int do_ut_lib(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_optee(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_overlay(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_ut_str(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 

diff --git a/test/Makefile b/test/Makefile
index 2971d0d87fb28c7eec4b2e64d70123742469c144..bab8f1a5c2b6d1af670073196434413b95ba64dc 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_UNIT_TEST) += ut.o
 obj-$(CONFIG_SANDBOX) += command_ut.o
 obj-$(CONFIG_SANDBOX) += compression.o
 obj-$(CONFIG_SANDBOX) += print_ut.o
+obj-$(CONFIG_SANDBOX) += str_ut.o
 obj-$(CONFIG_UT_TIME) += time_ut.o
 obj-$(CONFIG_UT_UNICODE) += unicode_ut.o
 obj-y += log/

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 7fdcdbb1a63760beada556b87abee4a85c4ea7a1..bd20a69c55219baceae71dc1d5da5e9c168f0a13 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -74,6 +74,8 @@ static cmd_tbl_t cmd_ut_sub[] = {
                         "", ""),
        U_BOOT_CMD_MKENT(bloblist, CONFIG_SYS_MAXARGS, 1, do_ut_bloblist,
                         "", ""),
+       U_BOOT_CMD_MKENT(str, CONFIG_SYS_MAXARGS, 1, do_ut_str,
+                        "", ""),
 #endif
 };
 
@@ -137,6 +139,9 @@ static char ut_help_text[] =
 #ifdef CONFIG_UT_OVERLAY
        "ut overlay [test-name]\n"
 #endif
+#ifdef CONFIG_SANDBOX
+       "ut str - Basic test of string functions\n"
+#endif
 #ifdef CONFIG_UT_TIME
        "ut time - Very basic test of time functions\n"
 #endif

diff --git a/test/str_ut.c b/test/str_ut.c
new file mode 100644 (file)
index 0000000..fab8de5
--- /dev/null
+++ b/test/str_ut.c
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2020 Google LLC
+ */
+
+#include <common.h>
+#include <vsprintf.h>
+#include <test/suites.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+/* This is large enough for any of the test strings */
+#define TEST_STR_SIZE  200
+
+static const char str1[] = "I'm sorry I'm late.";
+static const char str2[] = "1099abNo, don't bother apologising.";
+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 run_strtoul(struct unit_test_state *uts, const char *str, int base,
+                      ulong expect_val, int expect_endp_offset)
+{
+       char *endp;
+       ulong val;
+
+       val = simple_strtoul(str, &endp, base);
+       ut_asserteq(expect_val, val);
+       ut_asserteq(expect_endp_offset, endp - str);
+
+       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));
+
+       /* Invalid string */
+       ut_assertok(run_strtoul(uts, str1, 10, 0, 0));
+
+       /* 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 2 */
+       ut_assertok(run_strtoul(uts, str1, 2, 0, 0));
+       ut_assertok(run_strtoul(uts, str2, 2, 2, 2));
+
+       /* Check endp being NULL */
+       ut_asserteq(1099, simple_strtoul(str2, NULL, 0));
+
+       return 0;
+}
+STR_TEST(str_simple_strtoul, 0);
+
+int do_ut_str(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+       struct unit_test *tests = ll_entry_start(struct unit_test,
+                                                str_test);
+       const int n_ents = ll_entry_count(struct unit_test, str_test);
+
+       return cmd_ut_category("str", "str_", tests, n_ents, argc, argv);
+}