diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vboot_api_kernel_tests.c | 4 | ||||
-rw-r--r-- | tests/vboot_kernel2_tests.c | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index b66c4320..b2d4236e 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -602,6 +602,8 @@ static void VbTryLoadKernelTest(void) " load disk"); } TEST_EQ(got_external_mismatch, 0, " external GPT errors"); + TEST_EQ(!!(ctx->flags & VB2_CONTEXT_DISABLE_TPM), 0, + " ctx flag disable_tpm"); } TEST_EQ(lk_normal_calls, load_kernel_calls, " LoadKernel called"); TEST_EQ(lk_minios_calls, 0, " LoadMiniOsKernel not called"); @@ -627,6 +629,8 @@ static void VbTryLoadMiniOsKernelTest(void) " load disk"); } TEST_EQ(got_external_mismatch, 0, " external GPT errors"); + TEST_EQ(!!(ctx->flags & VB2_CONTEXT_DISABLE_TPM), 1, + " ctx flag disable_tpm"); } TEST_EQ(lk_normal_calls, 0, " LoadKernel not called"); TEST_EQ(lk_minios_calls, load_kernel_calls, diff --git a/tests/vboot_kernel2_tests.c b/tests/vboot_kernel2_tests.c index 5fc66f14..bbebf386 100644 --- a/tests/vboot_kernel2_tests.c +++ b/tests/vboot_kernel2_tests.c @@ -59,8 +59,6 @@ static struct mock_kernel kernels[MAX_MOCK_KERNELS]; static int kernel_count; static struct mock_kernel *cur_kernel; -static int mock_tpm_set_mode_calls; - static void add_mock_kernel(uint64_t sector, vb2_error_t rv) { if (kernel_count >= ARRAY_SIZE(kernels)) { @@ -118,8 +116,6 @@ static void reset_common_data(void) memset(&kernels, 0, sizeof(kernels)); kernel_count = 0; cur_kernel = NULL; - - mock_tpm_set_mode_calls = 0; } /* Mocks */ @@ -248,12 +244,6 @@ vb2_error_t vb2_digest_buffer(const uint8_t *buf, uint32_t size, return cur_kernel->rv; } -vb2_error_t vb2ex_tpm_set_mode(enum vb2_tpm_mode mode_val) -{ - mock_tpm_set_mode_calls++; - return VB2_SUCCESS; -} - /* Make sure nothing tested here ever calls this directly. */ void vb2api_fail(struct vb2_context *c, uint8_t reason, uint8_t subcode) { @@ -270,16 +260,12 @@ static void load_minios_kernel_tests(void) add_mock_kernel(0, VB2_SUCCESS); TEST_SUCC(LoadMiniOsKernel(ctx, &lkp, &disk_info, 0), "{valid kernel}"); - TEST_EQ(mock_tpm_set_mode_calls, 1, - " TPM disabled"); reset_common_data(); disk_info.bytes_per_lba = KBUF_SIZE; disk_info.lba_count = 1; TEST_EQ(LoadMiniOsKernel(ctx, &lkp, &disk_info, 0), VB2_ERROR_LK_NO_KERNEL_FOUND, "{no kernel}"); - TEST_EQ(mock_tpm_set_mode_calls, 0, - " TPM not disabled"); reset_common_data(); disk_info.bytes_per_lba = KBUF_SIZE; @@ -306,8 +292,6 @@ static void load_minios_kernel_tests(void) TEST_EQ(LoadMiniOsKernel(ctx, &lkp, &disk_info, 0), VB2_ERROR_LK_NO_KERNEL_FOUND, "{invalid kernel, invalid kernel}"); - TEST_EQ(mock_tpm_set_mode_calls, 0, - " TPM not disabled"); reset_common_data(); disk_info.bytes_per_lba = KBUF_SIZE; |