diff options
Diffstat (limited to 'tests/vb2_secdata_firmware_tests.c')
| -rw-r--r-- | tests/vb2_secdata_firmware_tests.c | 60 |
1 files changed, 21 insertions, 39 deletions
diff --git a/tests/vb2_secdata_firmware_tests.c b/tests/vb2_secdata_firmware_tests.c index 45e38347..84cb2741 100644 --- a/tests/vb2_secdata_firmware_tests.c +++ b/tests/vb2_secdata_firmware_tests.c @@ -99,64 +99,46 @@ static void secdata_firmware_test(void) vb2api_secdata_firmware_create(&ctx); vb2_secdata_firmware_init(&ctx); ctx.flags = 0; - TEST_SUCC(vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, - &v), - "Get flags"); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, 0, "Flags created 0"); test_changed(&ctx, 0, "Get doesn't change data"); - TEST_SUCC(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, - 0x12), - "Set flags"); + vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, 0x12); test_changed(&ctx, 1, "Set changes data"); - TEST_SUCC(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, - 0x12), - "Set flags 2"); + vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, 0x12); test_changed(&ctx, 0, "Set again doesn't change data"); - TEST_SUCC(vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, - &v), - "Get flags 2"); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_FLAGS); TEST_EQ(v, 0x12, "Flags changed"); - TEST_EQ(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, - 0x100), - VB2_ERROR_SECDATA_FIRMWARE_SET_FLAGS, "Bad flags"); + TEST_ABORT(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_FLAGS, + 0x100), + "Bad flags"); /* Read/write versions */ - TEST_SUCC(vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - &v), - "Get versions"); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS); TEST_EQ(v, 0, "Versions created 0"); test_changed(&ctx, 0, "Get doesn't change data"); - TEST_SUCC(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - 0x123456ff), - "Set versions"); + vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, + 0x123456ff); test_changed(&ctx, 1, "Set changes data"); - TEST_SUCC(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - 0x123456ff), - "Set versions 2"); + vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, + 0x123456ff); test_changed(&ctx, 0, "Set again doesn't change data"); - TEST_SUCC(vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - &v), - "Get versions 2"); + v = vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS); TEST_EQ(v, 0x123456ff, "Versions changed"); /* Invalid field fails */ - TEST_EQ(vb2_secdata_firmware_get(&ctx, -1, &v), - VB2_ERROR_SECDATA_FIRMWARE_GET_PARAM, "Get invalid"); - TEST_EQ(vb2_secdata_firmware_set(&ctx, -1, 456), - VB2_ERROR_SECDATA_FIRMWARE_SET_PARAM, "Set invalid"); + TEST_ABORT(vb2_secdata_firmware_get(&ctx, -1), "Get invalid"); + TEST_ABORT(vb2_secdata_firmware_set(&ctx, -1, 456), "Set invalid"); test_changed(&ctx, 0, "Set invalid field doesn't change data"); /* Read/write uninitialized data fails */ sd->status &= ~VB2_SD_STATUS_SECDATA_FIRMWARE_INIT; - TEST_EQ(vb2_secdata_firmware_get(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - &v), - VB2_ERROR_SECDATA_FIRMWARE_GET_UNINITIALIZED, - "Get uninitialized"); + TEST_ABORT(vb2_secdata_firmware_get(&ctx, + VB2_SECDATA_FIRMWARE_VERSIONS), + "Get uninitialized"); test_changed(&ctx, 0, "Get uninitialized doesn't change data"); - TEST_EQ(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, - 0x123456ff), - VB2_ERROR_SECDATA_FIRMWARE_SET_UNINITIALIZED, - "Set uninitialized"); + TEST_ABORT(vb2_secdata_firmware_set(&ctx, VB2_SECDATA_FIRMWARE_VERSIONS, + 0x123456ff), + "Set uninitialized"); test_changed(&ctx, 0, "Set uninitialized doesn't change data"); } |