test: log: Use UTF_CONSOLE in tests

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

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

diff --git a/include/test/log.h b/include/test/log.h
index e90289145002326e65e110282f837c337fe9532e..e3362b85e997aaabc7a9ef37eac44e4794d96c45 100644 (file)
--- a/include/test/log.h
+++ b/include/test/log.h
@@ -13,7 +13,8 @@
 #define LOGF_TEST (BIT(LOGF_FUNC) | BIT(LOGF_MSG))
 
 /* Declare a new logging test */
-#define LOG_TEST(_name) UNIT_TEST(_name, 0, log_test)
-#define LOG_TEST_FLAGS(_name, _flags) UNIT_TEST(_name, _flags, log_test)
+#define LOG_TEST(_name) UNIT_TEST(_name, UTF_CONSOLE, log_test)
+#define LOG_TEST_FLAGS(_name, _flags) \
+               UNIT_TEST(_name, _flags | UTF_CONSOLE, log_test)
 
 #endif /* __TEST_LOG_H__ */

diff --git a/test/log/cont_test.c b/test/log/cont_test.c
index 036d44b9d73d14345043b9fb6779cbf06b32920a..395a6587fa22079b752aa646ae30032ea51ae879 100644 (file)
--- a/test/log/cont_test.c
+++ b/test/log/cont_test.c
@@ -25,7 +25,6 @@ static int log_test_cont(struct unit_test_state *uts)
        /* Write two messages, the second continuing the first */
        gd->log_fmt = (1 << LOGF_CAT) | (1 << LOGF_LEVEL) | (1 << LOGF_MSG);
        gd->default_log_level = LOGL_INFO;
-       console_record_reset_enable();
        log(LOGC_ARCH, LOGL_ERR, "ea%d\n", 1);
        log(LOGC_CONT, LOGL_CONT, "cc%d\n", 2);
        gd->default_log_level = log_level;

diff --git a/test/log/log_filter.c b/test/log/log_filter.c
index e175f409c9b85fd2715021625dfd9e2f04a2f3c3..d36e9d9714ef32801255a3a5e74a5554579e4d91 100644 (file)
--- a/test/log/log_filter.c
+++ b/test/log/log_filter.c
@@ -38,7 +38,6 @@ static int log_test_filter(struct unit_test_state *uts)
        ulong filt1, filt2;
 
 #define create_filter(args, filter_num) do {\
-       ut_assertok(console_record_reset_enable()); \
        ut_assertok(run_command("log filter-add -p " args, 0)); \
        ut_assert_skipline(); \
        ut_assertok(strict_strtoul(uts->actual_str, 10, &(filter_num))); \
@@ -72,7 +71,6 @@ static int log_test_filter(struct unit_test_state *uts)
        ut_asserteq(true, filt2_found);
 
 #define remove_filter(filter_num) do { \
-       ut_assertok(console_record_reset_enable()); \
        snprintf(cmd, sizeof(cmd), "log filter-remove %lu", filter_num); \
        ut_assertok(run_command(cmd, 0)); \
        ut_assert_console_end(); \
@@ -95,7 +93,6 @@ static int log_test_filter(struct unit_test_state *uts)
        create_filter("", filt1);
        create_filter("", filt2);
 
-       ut_assertok(console_record_reset_enable());
        ut_assertok(run_command("log filter-remove -a", 0));
        ut_assert_console_end();
 

diff --git a/test/log/log_test.c b/test/log/log_test.c
index 357a3b57feba9ccf85c2a275729bf36a5f2f6b3e..59040c1327ca9d285c141ef9e13ad4cda034afa8 100644 (file)
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -110,11 +110,9 @@ int log_test_cat_allow(struct unit_test_state *uts)
        filt = log_add_filter("console", cat_list, LOGL_MAX, NULL);
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_cat(UCLASS_MMC);
        check_log_entries_extra();
 
-       ut_assertok(console_record_reset_enable());
        log_run_cat(UCLASS_SPI);
        check_log_entries_extra();
 
@@ -134,7 +132,6 @@ int log_test_cat_deny_implicit(struct unit_test_state *uts)
        filt = log_add_filter("console", cat_list, LOGL_MAX, NULL);
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_cat(UCLASS_SPI);
        check_log_entries_none();
 
@@ -151,11 +148,9 @@ int log_test_file(struct unit_test_state *uts)
        filt = log_add_filter("console", NULL, LOGL_MAX, "file");
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file");
        check_log_entries_flags(EXPECT_DIRECT | EXPECT_EXTRA | EXPECT_FORCE);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file2");
        check_log_entries_none();
 
@@ -172,7 +167,6 @@ int log_test_file_second(struct unit_test_state *uts)
        filt = log_add_filter("console", NULL, LOGL_MAX, "file,file2");
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file2");
        check_log_entries_flags(EXPECT_DIRECT | EXPECT_EXTRA | EXPECT_FORCE);
 
@@ -190,7 +184,6 @@ int log_test_file_mid(struct unit_test_state *uts)
                              "file,file2,log/log_test.c");
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file2");
        check_log_entries_extra();
 
@@ -207,7 +200,6 @@ int log_test_level(struct unit_test_state *uts)
        filt = log_add_filter("console", NULL, LOGL_WARNING, NULL);
        ut_assert(filt >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run();
        check_log_entries_flags_levels(EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
                                       LOGL_FIRST, LOGL_WARNING);
@@ -227,7 +219,6 @@ int log_test_double(struct unit_test_state *uts)
        filt2 = log_add_filter("console", NULL, LOGL_MAX, NULL);
        ut_assert(filt2 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run();
        check_log_entries_extra();
 
@@ -249,7 +240,6 @@ int log_test_triple(struct unit_test_state *uts)
        filt3 = log_add_filter("console", NULL, LOGL_MAX, "log/log_test.c");
        ut_assert(filt3 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file2");
        check_log_entries_extra();
 
@@ -264,7 +254,6 @@ int do_log_test_helpers(struct unit_test_state *uts)
 {
        int i;
 
-       ut_assertok(console_record_reset_enable());
        log_err("level %d\n", LOGL_EMERG);
        log_err("level %d\n", LOGL_ALERT);
        log_err("level %d\n", LOGL_CRIT);
@@ -296,7 +285,6 @@ LOG_TEST_FLAGS(log_test_helpers, UTF_CONSOLE);
 
 int do_log_test_disable(struct unit_test_state *uts)
 {
-       ut_assertok(console_record_reset_enable());
        log_err("default\n");
        ut_assert_nextline("%*s() default", CONFIG_LOGF_FUNC_PAD, __func__);
 
@@ -335,7 +323,6 @@ int log_test_cat_deny(struct unit_test_state *uts)
                                     LOGFF_DENY);
        ut_assert(filt2 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_cat(UCLASS_SPI);
        check_log_entries_none();
 
@@ -356,7 +343,6 @@ int log_test_file_deny(struct unit_test_state *uts)
                                     LOGFF_DENY);
        ut_assert(filt2 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run_file("file");
        check_log_entries_none();
 
@@ -377,7 +363,6 @@ int log_test_level_deny(struct unit_test_state *uts)
                                     LOGFF_DENY);
        ut_assert(filt2 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run();
        check_log_entries_flags_levels(EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
                                       LOGL_WARNING + 1,
@@ -401,7 +386,6 @@ int log_test_min(struct unit_test_state *uts)
                                     LOGFF_DENY | LOGFF_LEVEL_MIN);
        ut_assert(filt2 >= 0);
 
-       ut_assertok(console_record_reset_enable());
        log_run();
        check_log_entries_flags_levels(EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
                                       LOGL_WARNING, LOGL_INFO - 1);
@@ -419,8 +403,6 @@ int log_test_dropped(struct unit_test_state *uts)
        gd->flags &= ~(GD_FLG_LOG_READY);
        gd->log_drop_count = 0;
 
-       ut_assertok(console_record_reset_enable());
-
        log_run();
        ut_asserteq(2 * (LOGL_COUNT - LOGL_FIRST) +
                    _LOG_MAX_LEVEL - LOGL_FIRST + 1,
@@ -446,7 +428,6 @@ int log_test_buffer(struct unit_test_state *uts)
        for (i = 0; i < 0x11; i++)
                buf[i] = i * 0x11;
 
-       ut_assertok(console_record_reset_enable());
        log_buffer(LOGC_BOOT, LOGL_INFO, 0, buf, 1, 0x12, 0);
 
        /* This one should product no output due to the debug level */

diff --git a/test/log/nolog_ndebug.c b/test/log/nolog_ndebug.c
index b714a16d2e7e0c7b1f4fedb212d27a495ee153cc..d33359d59b73f863ada72485a26c68d46f115722 100644 (file)
--- a/test/log/nolog_ndebug.c
+++ b/test/log/nolog_ndebug.c
@@ -21,7 +21,6 @@ static int log_test_log_disabled_ndebug(struct unit_test_state *uts)
        int i;
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
 
        /* Output a log record at every level */
        for (i = LOGL_EMERG; i < LOGL_COUNT; i++)

diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c
index c4c0fa6cf81a055855daf84a8bc0a667825cbf20..e9cfea9902607cd83d1070396bb82c4a619aaf3d 100644 (file)
--- a/test/log/nolog_test.c
+++ b/test/log/nolog_test.c
@@ -25,7 +25,6 @@ static int log_test_nolog_err(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_err("testing %s\n", "log_err");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_line(uts, "testing log_err"));
@@ -39,7 +38,6 @@ static int log_test_nolog_warning(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_warning("testing %s\n", "log_warning");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_line(uts, "testing log_warning"));
@@ -53,7 +51,6 @@ static int log_test_nolog_notice(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_notice("testing %s\n", "log_notice");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_line(uts, "testing log_notice"));
@@ -67,7 +64,6 @@ static int log_test_nolog_info(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_err("testing %s\n", "log_info");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_line(uts, "testing log_info"));
@@ -83,7 +79,6 @@ static int nolog_test_nodebug(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        debug("testing %s\n", "debug");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_end(uts));
@@ -96,7 +91,6 @@ static int log_test_nolog_nodebug(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_debug("testing %s\n", "log_debug");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assert(!strcmp(buf, ""));
@@ -112,7 +106,6 @@ static int nolog_test_debug(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        debug("testing %s\n", "debug");
        gd->flags &= ~GD_FLG_RECORD;
        ut_assertok(ut_check_console_line(uts, "testing debug"));
@@ -126,7 +119,6 @@ static int log_test_nolog_debug(struct unit_test_state *uts)
        char buf[BUFFSIZE];
 
        memset(buf, 0, BUFFSIZE);
-       console_record_reset_enable();
        log_debug("testing %s\n", "log_debug");
        log(LOGC_NONE, LOGL_DEBUG, "more %s\n", "log_debug");
        gd->flags &= ~GD_FLG_RECORD;

diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c
index 30f30d98fe143ed955ac67809b5ab531b8163d61..467ecf28601c4f150b8a0a8f9466725c86394473 100644 (file)
--- a/test/log/pr_cont_test.c
+++ b/test/log/pr_cont_test.c
@@ -28,7 +28,6 @@ static int log_test_pr_cont(struct unit_test_state *uts)
        /* Write two messages, the second continuing the first */
        gd->log_fmt = BIT(LOGF_MSG);
        gd->default_log_level = LOGL_INFO;
-       console_record_reset_enable();
        pr_err("ea%d ", 1);
        pr_cont("cc%d\n", 2);
        gd->default_log_level = log_level;