diff mbox series

[U-Boot,2/2] video: test: Add ANSI escape sequence tests

Message ID 20170925194511.15872-2-robdclark@gmail.com
State Accepted
Commit 40186ee213794d1a6e47e787aa424b3587711289
Delegated to: Anatolij Gustschin
Headers show
Series [U-Boot,1/2] video: test: Helper for writing strings | expand

Commit Message

Rob Clark Sept. 25, 2017, 7:45 p.m. UTC 
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
Not sure if there is a way to inject a -l arg when test.py runs
sanbox somehow, to visually confirm the results?  It is not really
possible to do manually since 'echo' command doesn't handle escape
sequences properly.  At any rate, efi_console uses all the same
escape sequences, and at least with a 32bpp display they look
correct.

 test/dm/video.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Comments

Anatolij Gustschin Sept. 29, 2017, 8:51 p.m. UTC | #1 
On Mon, 25 Sep 2017 15:45:09 -0400
Rob Clark robdclark@gmail.com wrote:

> Signed-off-by: Rob Clark <robdclark@gmail.com>
> ---
> Not sure if there is a way to inject a -l arg when test.py runs
> sanbox somehow, to visually confirm the results?  It is not really
> possible to do manually since 'echo' command doesn't handle escape
> sequences properly.  At any rate, efi_console uses all the same
> escape sequences, and at least with a 32bpp display they look
> correct.
> 
>  test/dm/video.c | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)

Applied to u-boot-video/master, thanks!

--
Anatolij
diff mbox series

Patch

diff --git a/test/dm/video.c b/test/dm/video.c
index 6a5626c5e3..29917d0c2d 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -159,6 +159,40 @@  static int dm_test_video_chars(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_video_chars, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
 
+#ifdef CONFIG_VIDEO_ANSI
+#define ANSI_ESC "\x1b"
+/* Test handling of ANSI escape sequences */
+static int dm_test_video_ansi(struct unit_test_state *uts)
+{
+	struct udevice *dev, *con;
+
+	ut_assertok(select_vidconsole(uts, "vidconsole0"));
+	ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev));
+	ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
+
+	/* reference clear: */
+	video_clear(con->parent);
+	video_sync(con->parent);
+	ut_asserteq(46, compress_frame_buffer(dev));
+
+	/* test clear escape sequence: [2J */
+	vidconsole_put_string(con, "A\tB\tC"ANSI_ESC"[2J");
+	ut_asserteq(46, compress_frame_buffer(dev));
+
+	/* test set-cursor: [%d;%df */
+	vidconsole_put_string(con, "abc"ANSI_ESC"[2;2fab"ANSI_ESC"[4;4fcd");
+	ut_asserteq(142, compress_frame_buffer(dev));
+
+	/* test colors (30-37 fg color, 40-47 bg color) */
+	vidconsole_put_string(con, ANSI_ESC"[30;41mfoo"); /* black on red */
+	vidconsole_put_string(con, ANSI_ESC"[33;44mbar"); /* yellow on blue */
+	ut_asserteq(268, compress_frame_buffer(dev));
+
+	return 0;
+}
+DM_TEST(dm_test_video_ansi, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+#endif
+
 /**
  * check_vidconsole_output() - Run a text console test
  *