]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge patch series "Tidy up console recording in tests"
authorTom Rini <trini@konsulko.com>
Tue, 27 Aug 2024 00:52:18 +0000 (18:52 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 27 Aug 2024 00:52:18 +0000 (18:52 -0600)
Simon Glass <sjg@chromium.org> says:

This series started as a small fix for checking for an empty line,
but in the process several other problems were found and fixed:

- fix tests which use console recording but don't set the flag
- drop unnecessary resetting of the console in tests
- drop unnecessary blank line before MMC output
- update the docs a little
- fix buildman test failure on newer Pythons
- a few other minor things

This series also renames the confusing flag names, so that they are
easier to remember - just a UTF_ (unit-test flags) prefix.

1  2 
common/console.c
test/cmd/bdinfo.c
test/cmd/pinmux.c
test/log/log_test.c

Simple merge
Simple merge
index 7ab7004b6843b57e9612bd7ed0f516a6c213ff12,be39dbc61bd1ef59bdba7f3b5b7c7cbcc1cfaa55..65974d03f88c8edfa0995baab937747f9627cbbb
@@@ -28,15 -26,8 +26,14 @@@ static int dm_test_cmd_pinmux_status_pi
        ut_assert_nextlinen("P7        : GPIO2 bias-pull-down input-enable.");
        ut_assert_console_end();
  
-       console_record_reset();
        run_command("pinmux status P9", 0);
 -      ut_assert_nextlinen("single-pinctrl pinctrl-single-no-width: missing register width");
 +      if (IS_ENABLED(CONFIG_LOGF_FUNC)) {
 +              ut_assert_nextlinen(
 +                      "   single_of_to_plat() single-pinctrl pinctrl-single-no-width: missing register width");
 +      } else {
 +              ut_assert_nextlinen(
 +                      "single-pinctrl pinctrl-single-no-width: missing register width");
 +      }
        ut_assert_nextlinen("P9 not found");
        ut_assert_console_end();
  
index 18f8a2d9391ca4db1067c242c393711d0de9969c,59040c1327ca9d285c141ef9e13ad4cda034afa8..1c89df4ef188284410cfa6795be47d8a4125d0b1
@@@ -377,11 -363,10 +363,10 @@@ int log_test_level_deny(struct unit_tes
                                     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,
 -                                     min(gd->default_log_level, LOGL_INFO));
 +      check_log_entries_flags_levels(
 +              EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
 +              LOGL_WARNING + 1, min((int)gd->default_log_level, LOGL_INFO));
  
        ut_assertok(log_remove_filter("console", filt1));
        ut_assertok(log_remove_filter("console", filt2));