test: Add a new suite for commands

Add a new suite for 'cmd' tests, used for testing commands. These are
kept in the test/cmd directory.

For now it is empty, but it will be used for coreboot-command tests.

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

diff --git a/include/test/cmd.h b/include/test/cmd.h
new file mode 100644 (file)
index 0000000..c200570
--- /dev/null
+++ b/include/test/cmd.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2023 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#ifndef __TEST_CMD_H__
+#define __TEST_CMD_H__
+
+#include <test/test.h>
+
+/* Declare a new command test */
+#define CMD_TEST(_name, _flags) UNIT_TEST(_name, _flags, cmd_test)
+
+#endif /* __TEST_CMD_H__ */

diff --git a/include/test/suites.h b/include/test/suites.h
index ad4fc926f48f15a20675c4f89a816c492c2e24fd..49224d8ea2e851328782f55dcdb138ca811a3469 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -34,6 +34,7 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc,
                  char *const argv[]);
 int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[]);
+int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_common(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[]);

diff --git a/test/cmd/Makefile b/test/cmd/Makefile
index e296ba1192b848e4e388e5f9607d966f13255be6..7e40e25b9e865b7b6700fa47af77754d5996a48c 100644 (file)
--- a/test/cmd/Makefile
+++ b/test/cmd/Makefile
@@ -3,6 +3,8 @@
 # Copyright (c) 2013 Google, Inc
 # Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
 
+obj-y += cmd_ut_cmd.o
+
 ifdef CONFIG_HUSH_PARSER
 obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o
 endif

diff --git a/test/cmd/cmd_ut_cmd.c b/test/cmd/cmd_ut_cmd.c
new file mode 100644 (file)
index 0000000..e77fa1c
--- /dev/null
+++ b/test/cmd/cmd_ut_cmd.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2023 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * Unit tests for command functions
+ */
+
+#include <command.h>
+#include <test/cmd.h>
+#include <test/suites.h>
+#include <test/ut.h>
+
+int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       struct unit_test *tests = UNIT_TEST_SUITE_START(cmd_test);
+       const int n_ents = UNIT_TEST_SUITE_COUNT(cmd_test);
+
+       return cmd_ut_category("cmd", "cmd_test_", tests, n_ents, argc, argv);
+}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 2ead1c68e0ea783745b959c3671fe2d35125aed7..60cd049eb9b8a39aeda302cb5bb464123fd6d72c 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -60,6 +60,9 @@ static struct cmd_tbl cmd_ut_sub[] = {
 #ifdef CONFIG_BOOTSTD
        U_BOOT_CMD_MKENT(bootstd, CONFIG_SYS_MAXARGS, 1, do_ut_bootstd,
                         "", ""),
+#endif
+#ifdef CONFIG_CMDLINE
+       U_BOOT_CMD_MKENT(cmd, CONFIG_SYS_MAXARGS, 1, do_ut_cmd, "", ""),
 #endif
        U_BOOT_CMD_MKENT(common, CONFIG_SYS_MAXARGS, 1, do_ut_common, "", ""),
 #if defined(CONFIG_UT_DM)
@@ -195,6 +198,9 @@ U_BOOT_LONGHELP(ut,
 #ifdef CONFIG_BOOTSTD
        "\nbootstd - standard boot implementation"
 #endif
+#ifdef CONFIG_CMDLINE
+       "\ncmd - test various commands"
+#endif
 #ifdef CONFIG_SANDBOX
        "\ncompression - compressors and bootm decompression"
 #endif