test: Use UTF_CONSOLE in remaining tests

Set this flag rather than doing things manually in the test.

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

diff --git a/test/common/cread.c b/test/common/cread.c
index e159caed04196e5096e802451cfddb0f8b1540a3..4926c21680353d89ce7968869ebe2d04de9f2542 100644 (file)
--- a/test/common/cread.c
+++ b/test/common/cread.c
@@ -66,8 +66,6 @@ static int cread_test(struct unit_test_state *uts)
         * print_buffer(0, buf, 1, 7, 0);
         */
 
-       console_record_reset_enable();
-
        /* simple input */
        *buf = '\0';
        ut_asserteq(4, console_in_puts("abc\n"));
@@ -102,4 +100,4 @@ static int cread_test(struct unit_test_state *uts)
 
        return 0;
 }
-COMMON_TEST(cread_test, 0);
+COMMON_TEST(cread_test, UTF_CONSOLE);

diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c
index a556cbf8e33af894c36bca77968a87c97de4787b..e3050d02c605b5df7f3962abae052d88cb980029 100644 (file)
--- a/test/common/test_autoboot.c
+++ b/test/common/test_autoboot.c
@@ -20,7 +20,6 @@ static int check_for_input(struct unit_test_state *uts, const char *in,
        const char *autoboot_prompt =
                "Enter password \"a\" in 1 seconds to stop autoboot";
 
-       console_record_reset_enable();
        console_in_puts(in);
 
        /* turn on keyed autoboot for the test, if possible */
@@ -91,4 +90,4 @@ static int test_autoboot(struct unit_test_state *uts)
 
        return CMD_RET_SUCCESS;
 }
-COMMON_TEST(test_autoboot, 0);
+COMMON_TEST(test_autoboot, UTF_CONSOLE);

diff --git a/test/lib/test_print.c b/test/lib/test_print.c
index e356afc22ba01fb58848361ef88eb9f3c166518e..55e3ea1ed59160c6cb57bb760787d4b848af2e3c 100644 (file)
--- a/test/lib/test_print.c
+++ b/test/lib/test_print.c
@@ -17,10 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static int test_print_freq(struct unit_test_state *uts,
                           uint64_t freq, char *expected)
 {
-       ut_silence_console(uts);
-       console_record_reset_enable();
        print_freq(freq, ";\n");
-       ut_unsilence_console(uts);
        console_record_readline(uts->actual_str, sizeof(uts->actual_str));
        ut_asserteq_str(expected, uts->actual_str);
        ut_assertok(ut_check_console_end(uts));
@@ -41,15 +38,12 @@ static int lib_test_print_freq(struct unit_test_state *uts)
        ut_assertok(test_print_freq(uts, 54321987654321, "54321.99 GHz;"));
        return 0;
 }
-LIB_TEST(lib_test_print_freq, 0);
+LIB_TEST(lib_test_print_freq, UTF_CONSOLE);
 
 static int test_print_size(struct unit_test_state *uts,
                           uint64_t freq, char *expected)
 {
-       ut_silence_console(uts);
-       console_record_reset_enable();
        print_size(freq, ";\n");
-       ut_unsilence_console(uts);
        console_record_readline(uts->actual_str, sizeof(uts->actual_str));
        ut_asserteq_str(expected, uts->actual_str);
        ut_assertok(ut_check_console_end(uts));
@@ -73,4 +67,4 @@ static int lib_test_print_size(struct unit_test_state *uts)
        ut_assertok(test_print_size(uts, 54321987654321, "49.4 TiB;"));
        return 0;
 }
-LIB_TEST(lib_test_print_size, 0);
+LIB_TEST(lib_test_print_size, UTF_CONSOLE);

diff --git a/test/print_ut.c b/test/print_ut.c
index cf0d5929508c84ac327a9968eb7abacac383e570..f5e607b21a3c2f1d2a4d93383af6c7ed7bcb46c7 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -180,14 +180,12 @@ static int print_display_buffer(struct unit_test_state *uts)
                buf[i] = i * 0x11;
 
        /* bytes */
-       console_record_reset();
        print_buffer(0, buf, 1, 0x12, 0);
        ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........");
        ut_assert_nextline("00000010: 10 00                                            ..");
        ut_assert_console_end();
 
        /* line length */
-       console_record_reset();
        print_buffer(0, buf, 1, 0x12, 8);
        ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77  ..\"3DUfw");
        ut_assert_nextline("00000008: 88 99 aa bb cc dd ee ff  ........");
@@ -195,7 +193,6 @@ static int print_display_buffer(struct unit_test_state *uts)
        ut_assert_console_end();
 
        /* long line */
-       console_record_reset();
        buf[0x41] = 0x41;
        print_buffer(0, buf, 1, 0x42, 0x40);
        ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ..\"3DUfw........................................................");
@@ -203,35 +200,30 @@ static int print_display_buffer(struct unit_test_state *uts)
        ut_assert_console_end();
 
        /* address */
-       console_record_reset();
        print_buffer(0x12345678, buf, 1, 0x12, 0);
        ut_assert_nextline("12345678: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........");
        ut_assert_nextline("12345688: 10 00                                            ..");
        ut_assert_console_end();
 
        /* 16-bit */
-       console_record_reset();
        print_buffer(0, buf, 2, 9, 0);
        ut_assert_nextline("00000000: 1100 3322 5544 7766 9988 bbaa ddcc ffee  ..\"3DUfw........");
        ut_assert_nextline("00000010: 0010                                     ..");
        ut_assert_console_end();
 
        /* 32-bit */
-       console_record_reset();
        print_buffer(0, buf, 4, 5, 0);
        ut_assert_nextline("00000000: 33221100 77665544 bbaa9988 ffeeddcc  ..\"3DUfw........");
        ut_assert_nextline("00000010: 00000010                             ....");
        ut_assert_console_end();
 
        /* 64-bit */
-       console_record_reset();
        print_buffer(0, buf, 8, 3, 0);
        ut_assert_nextline("00000000: 7766554433221100 ffeeddccbbaa9988  ..\"3DUfw........");
        ut_assert_nextline("00000010: 0000000000000010                   ........");
        ut_assert_console_end();
 
        /* ASCII */
-       console_record_reset();
        buf[1] = 31;
        buf[2] = 32;
        buf[3] = 33;
@@ -289,7 +281,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
                buf[i] = i * 0x11;
 
        /* bytes */
-       console_record_reset();
        print_hex_dump_bytes("", DUMP_PREFIX_ADDRESS, buf, 0x12);
        ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........",
                           IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
@@ -298,7 +289,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        ut_assert_console_end();
 
        /* line length */
-       console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 8, 1, buf, 0x12, true);
        ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77  ..\"3DUfw",
                           IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
@@ -310,7 +300,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        unmap_sysmem(buf);
 
        /* long line */
-       console_record_reset();
        buf[0x41] = 0x41;
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0x40, 1, buf, 0x42, true);
        ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ..\"3DUfw........................................................",
@@ -320,7 +309,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        ut_assert_console_end();
 
        /* 16-bit */
-       console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0, 2, buf, 0x12, true);
        ut_assert_nextline("%0*lx: 1100 3322 5544 7766 9988 bbaa ddcc ffee  ..\"3DUfw........",
                           IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
@@ -330,7 +318,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        unmap_sysmem(buf);
 
        /* 32-bit */
-       console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0, 4, buf, 0x14, true);
        ut_assert_nextline("%0*lx: 33221100 77665544 bbaa9988 ffeeddcc  ..\"3DUfw........",
                           IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
@@ -340,7 +327,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        unmap_sysmem(buf);
 
        /* 64-bit */
-       console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 8, buf, 0x18, true);
        ut_assert_nextline("%0*lx: 7766554433221100 ffeeddccbbaa9988  ..\"3DUfw........",
                           IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
@@ -350,7 +336,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        unmap_sysmem(buf);
 
        /* ASCII */
-       console_record_reset();
        buf[1] = 31;
        buf[2] = 32;
        buf[3] = 33;