diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vb2_misc_tests.c | 21 | ||||
-rw-r--r-- | tests/vb2_ui_tests.c | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 042c0f71..c4b3ce44 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -640,24 +640,35 @@ static void dev_switch_tests(void) static void enable_dev_tests(void) { reset_common_data(); - vb2api_enable_developer_mode(ctx); + allow_recovery_retval = 0; + TEST_FAIL(vb2api_enable_developer_mode(ctx), + "vb2api_enable_developer_mode - failed"); + TEST_EQ(vb2_secdata_firmware_get(ctx, VB2_SECDATA_FIRMWARE_FLAGS) & + VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE, 0, + " dev mode flag not set"); + + reset_common_data(); + allow_recovery_retval = 1; + TEST_SUCC(vb2api_enable_developer_mode(ctx), + "vb2api_enable_developer_mode - success"); TEST_NEQ(vb2_secdata_firmware_get(ctx, VB2_SECDATA_FIRMWARE_FLAGS) & VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE, 0, - "dev mode flag set"); + " dev mode flag set"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), BOOT_EXTERNAL_ON_DEV, - "NV_DEV_BOOT_EXTERNAL set according to compile-time flag"); + " NV_DEV_BOOT_EXTERNAL set according to compile-time flag"); /* secdata_firmware not initialized, aborts */ reset_common_data(); + allow_recovery_retval = 1; sd->status &= ~VB2_SD_STATUS_SECDATA_FIRMWARE_INIT; TEST_ABORT(vb2api_enable_developer_mode(ctx), "secdata_firmware no init, enable dev mode aborted"); sd->status |= VB2_SD_STATUS_SECDATA_FIRMWARE_INIT; TEST_EQ(vb2_secdata_firmware_get(ctx, VB2_SECDATA_FIRMWARE_FLAGS) & VB2_SECDATA_FIRMWARE_FLAG_DEV_MODE, 0, - "dev mode flag not set"); + " dev mode flag not set"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_EXTERNAL), 0, - "NV_DEV_BOOT_EXTERNAL not set"); + " NV_DEV_BOOT_EXTERNAL not set"); } static void tpm_clear_tests(void) diff --git a/tests/vb2_ui_tests.c b/tests/vb2_ui_tests.c index ca9a9987..95d22900 100644 --- a/tests/vb2_ui_tests.c +++ b/tests/vb2_ui_tests.c @@ -527,9 +527,10 @@ int vb2ex_physical_presence_pressed(void) return mock_pp_pressed[mock_iters]; } -void vb2api_enable_developer_mode(struct vb2_context *c) +vb2_error_t vb2api_enable_developer_mode(struct vb2_context *c) { mock_enable_dev_mode = 1; + return VB2_SUCCESS; } const char *vb2ex_get_debug_info(struct vb2_context *c) |