boot: Add a new test for global bootmeths

These have different behaviour from normal bootmeths and we are about to
enhance it. So add a test and also an extra check in bootflow_iter()

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-09-29 11:20:20 -06:00
parent dcd69dc315
commit 7e9ee27101

View File

@@ -313,6 +313,8 @@ static int bootflow_iter(struct unit_test_state *uts)
ut_asserteq(0, iter.max_part);
ut_asserteq_str("extlinux", iter.method->name);
ut_asserteq(0, bflow.err);
ut_assert(!iter.doing_global);
ut_asserteq(-1, iter.first_glob_method);
/*
* This shows MEDIA even though there is none, since in
@@ -426,6 +428,49 @@ static int bootflow_iter(struct unit_test_state *uts)
BOOTSTD_TEST(bootflow_iter, UTF_DM | UTF_SCAN_FDT | UTF_CONSOLE);
#if defined(CONFIG_SANDBOX) && defined(CONFIG_BOOTMETH_GLOBAL)
/* Check iterating through available bootflows to test global bootmeths */
static int bootflow_iter_glob(struct unit_test_state *uts)
{
struct bootflow_iter iter;
struct bootflow bflow;
bootstd_clear_glob();
/* we should get the global bootmeth initially */
ut_asserteq(-EINVAL,
bootflow_scan_first(NULL, NULL, &iter, BOOTFLOWIF_ALL |
BOOTFLOWIF_SHOW, &bflow));
bootflow_show(0, &bflow, true);
ut_asserteq(4, iter.num_methods);
ut_assert(iter.doing_global);
ut_asserteq(3, iter.first_glob_method);
ut_asserteq(3, iter.cur_method);
ut_asserteq(0, iter.part);
ut_asserteq(0, iter.max_part);
ut_asserteq_str("firmware0", iter.method->name);
ut_asserteq(0, bflow.err);
bootflow_free(&bflow);
/* next we should get the first non-global bootmeth */
ut_asserteq(-EPROTONOSUPPORT, bootflow_scan_next(&iter, &bflow));
/* at this point the global bootmeths are stranded above num_methods */
ut_asserteq(3, iter.num_methods);
ut_asserteq(3, iter.first_glob_method);
ut_assert(!iter.doing_global);
ut_asserteq(0, iter.cur_method);
ut_asserteq(0, iter.part);
ut_asserteq(0, iter.max_part);
ut_asserteq_str("extlinux", iter.method->name);
ut_asserteq(0, bflow.err);
return 0;
}
BOOTSTD_TEST(bootflow_iter_glob, UTF_DM | UTF_SCAN_FDT);
/* Check using the system bootdev */
static int bootflow_system(struct unit_test_state *uts)
{