Merge branch '2022-09-02-assorted-improvements' into next

- DM RTC improvements that should help in CI, allow disabling LTO from
  the make line, add extension (cape, etc) support to distro bootcmd,
  add a pause command and re-enable ARM v4T support.

2 files changed, 48 insertions, 0 deletions

diff --git a/test/cmd/Makefile b/test/cmd/Makefile
index c331757425e..1bb02d93a23 100644
--- a/test/cmd/Makefile
+++ b/test/cmd/Makefile
@@ -5,6 +5,9 @@
 ifdef CONFIG_HUSH_PARSER
 obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o
 endif
+ifdef CONFIG_CONSOLE_RECORD
+obj-$(CONFIG_CMD_PAUSE) += test_pause.o
+endif
 obj-y += mem.o
 obj-$(CONFIG_CMD_ADDRMAP) += addrmap.o
 obj-$(CONFIG_CMD_FDT) += fdt.o
diff --git a/test/cmd/test_pause.c b/test/cmd/test_pause.c
new file mode 100644
index 00000000000..2b85cce3271
--- /dev/null
+++ b/test/cmd/test_pause.c
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Tests for pause command
+ *
+ * Copyright 2022, Samuel Dionne-Riel <[email protected]>
+ */
+
+#include <common.h>
+#include <asm/global_data.h>
+#include <test/lib.h>
+#include <test/ut.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int lib_test_hush_pause(struct unit_test_state *uts)
+{
+	/* Test default message */
+	console_record_reset_enable();
+	/* Cook a newline when the command is expected to pause */
+	console_in_puts("\n");
+	ut_assertok(run_command("pause", 0));
+	console_record_readline(uts->actual_str, sizeof(uts->actual_str));
+	ut_asserteq_str("Press any key to continue...", uts->actual_str);
+	ut_assertok(ut_check_console_end(uts));
+
+	/* Test provided message */
+	console_record_reset_enable();
+	/* Cook a newline when the command is expected to pause */
+	console_in_puts("\n");
+	ut_assertok(run_command("pause 'Prompt for pause...'", 0));
+	console_record_readline(uts->actual_str, sizeof(uts->actual_str));
+	ut_asserteq_str("Prompt for pause...", uts->actual_str);
+	ut_assertok(ut_check_console_end(uts));
+
+	/* Test providing more than one params */
+	console_record_reset_enable();
+	/* No newline cooked here since the command is expected to fail */
+	ut_asserteq(1, run_command("pause a b", 0));
+	console_record_readline(uts->actual_str, sizeof(uts->actual_str));
+	ut_asserteq_str("pause - delay until user input", uts->actual_str);
+	ut_asserteq(1, ut_check_console_end(uts));
+
+	return 0;
+}
+LIB_TEST(lib_test_hush_pause, 0);