diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-06-08 16:59:45 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-10 09:22:32 +0000 |
| commit | 070d4f167ccca67ba06f41c892f588f28d376b4c (patch) | |
| tree | 64af53b71aab383db46321860daf609171b46776 /tests/vb2_misc_tests.c | |
| parent | 9a923c7dba003a5ddbc55937469c975689effa62 (diff) | |
| download | vboot-070d4f167ccca67ba06f41c892f588f28d376b4c.tar.gz | |
vboot: publicize vb2_get_dev_boot_target()
Publicize vb2_get_dev_boot_target() as
vb2api_get_dev_default_boot_target(), and move enum vb2_dev_default_boot
to 2api.h as enum vb2_dev_default_boot_target.
BRANCH=none
BUG=b:146399181, b:157871585
TEST=make runtests
TEST=emerge-puff depthcharge
Change-Id: I8336e63cc273c32a41e6b1f2aad886c3940a6aef
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2234788
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb2_misc_tests.c')
| -rw-r--r-- | tests/vb2_misc_tests.c | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index aabe0ee6..eaf7869f 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -854,57 +854,74 @@ static void dev_default_boot_tests(void) { /* No default boot */ reset_common_data(); - TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_DISK, + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, "no default boot, boot disk"); /* Set boot legacy by GBB */ reset_common_data(); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY; - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_LEGACY, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_USB); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY, "GBB set default boot legacy"); /* Boot from disk */ reset_common_data(); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_DISK); - TEST_EQ(vb2_get_dev_boot_target(ctx), VB2_DEV_DEFAULT_BOOT_DISK, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_DISK); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, "set default boot disk"); /* Boot from usb */ reset_common_data(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_USB, "set default boot usb"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_USB); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_USB, + "set default boot usb"); /* Boot from usb not allowed */ reset_common_data(); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_DISK, "default boot usb not allowed"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_USB); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, + "default boot usb not allowed"); reset_common_data(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_DISK, "default boot usb not allowed"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_USB); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, + "default boot usb not allowed"); /* Boot legacy */ reset_common_data(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_LEGACY, "set default boot legacy"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY, + "set default boot legacy"); /* Boot legacy not allowed */ reset_common_data(); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_DISK, "default boot legacy not allowed"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, + "default boot legacy not allowed"); reset_common_data(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); - vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(vb2_get_dev_boot_target(ctx), - VB2_DEV_DEFAULT_BOOT_DISK, "default boot legacy not allowed"); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, + VB2_DEV_DEFAULT_BOOT_TARGET_LEGACY); + TEST_EQ(vb2api_get_dev_default_boot_target(ctx), + VB2_DEV_DEFAULT_BOOT_TARGET_DISK, + "default boot legacy not allowed"); } static void dev_boot_allowed_tests(void) |