diff options
author | Dan Ehrenberg <dehrenberg@chromium.org> | 2014-12-09 13:42:15 -0800 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-11 03:12:14 +0000 |
commit | b3d38f5c620da89662deb1a08971c5025d6c1132 (patch) | |
tree | 1a401569a1d4faf8c45c32708a1b3856b707e190 /tests | |
parent | cfe83a827d40b310003fc6996b9978d8cf301444 (diff) | |
download | vboot-b3d38f5c620da89662deb1a08971c5025d6c1132.tar.gz |
vboot: GPT interface cleanup
- Rename drive_sectors to streaming_drive_sectors, to contrast with
gpt_drive_sectors
- Replace stored_on_device field with flags field for future
extensibility
BUG=chromium:433433
TEST=make runtests
BRANCH=none
Change-Id: I785a3b735b8eb96f647a334659329db3ee43eb80
Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/234283
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cgptlib_test.c | 120 | ||||
-rw-r--r-- | tests/vboot_kernel_tests.c | 34 |
2 files changed, 78 insertions, 76 deletions
diff --git a/tests/cgptlib_test.c b/tests/cgptlib_test.c index fd5cda16..e81f50e7 100644 --- a/tests/cgptlib_test.c +++ b/tests/cgptlib_test.c @@ -149,7 +149,8 @@ static void BuildTestGptData(GptData *gpt) Guid chromeos_rootfs = GPT_ENT_TYPE_CHROMEOS_ROOTFS; gpt->sector_bytes = DEFAULT_SECTOR_SIZE; - gpt->drive_sectors = gpt->gpt_drive_sectors = DEFAULT_DRIVE_SECTORS; + gpt->streaming_drive_sectors = + gpt->gpt_drive_sectors = DEFAULT_DRIVE_SECTORS; gpt->current_kernel = CGPT_KERNEL_ENTRY_NOT_FOUND; gpt->valid_headers = MASK_BOTH; gpt->valid_entries = MASK_BOTH; @@ -255,7 +256,8 @@ static int ParameterTests(void) for (i = 0; i < ARRAY_SIZE(cases); ++i) { BuildTestGptData(gpt); gpt->sector_bytes = cases[i].sector_bytes; - gpt->drive_sectors = gpt->gpt_drive_sectors = cases[i].drive_sectors; + gpt->streaming_drive_sectors = + gpt->gpt_drive_sectors = cases[i].drive_sectors; EXPECT(cases[i].expected_retval == CheckParameters(gpt)); } @@ -350,15 +352,15 @@ static int SignatureTest(void) GptHeader *h2 = (GptHeader *)gpt->secondary_header; int i; - EXPECT(1 == CheckHeader(NULL, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(NULL, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); for (i = 0; i < 8; ++i) { BuildTestGptData(gpt); h1->signature[i] ^= 0xff; h2->signature[i] ^= 0xff; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); } return TEST_OK; @@ -392,9 +394,9 @@ static int RevisionTest(void) h2->revision = cases[i].value_to_test; RefreshCrc32(gpt); - EXPECT(CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); - EXPECT(CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); } return TEST_OK; @@ -425,9 +427,9 @@ static int SizeTest(void) h2->size = cases[i].value_to_test; RefreshCrc32(gpt); - EXPECT(CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); - EXPECT(CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); } return TEST_OK; @@ -444,12 +446,12 @@ static int CrcFieldTest(void) /* Modify a field that the header verification doesn't care about */ h1->entries_crc32++; h2->entries_crc32++; - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); /* Refresh the CRC; should pass now */ RefreshCrc32(gpt); - EXPECT(0 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(0 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(0 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(0 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); return TEST_OK; } @@ -465,8 +467,8 @@ static int ReservedFieldsTest(void) h1->reserved_zero ^= 0x12345678; /* whatever random */ h2->reserved_zero ^= 0x12345678; /* whatever random */ RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); #ifdef PADDING_CHECKED /* TODO: padding check is currently disabled */ @@ -474,8 +476,8 @@ static int ReservedFieldsTest(void) h1->padding[12] ^= 0x34; /* whatever random */ h2->padding[56] ^= 0x78; /* whatever random */ RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); #endif return TEST_OK; @@ -513,9 +515,9 @@ static int SizeOfPartitionEntryTest(void) { cases[i].value_to_test; RefreshCrc32(gpt); - EXPECT(CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); - EXPECT(CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].expect_rv); } @@ -536,11 +538,11 @@ static int NumberOfPartitionEntriesTest(void) h1->number_of_entries--; h2->number_of_entries /= 2; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); /* But it's okay to have less if the GPT structs are stored elsewhere. */ - EXPECT(0 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); - EXPECT(0 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(0 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); + EXPECT(0 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); return TEST_OK; } @@ -555,37 +557,37 @@ static int MyLbaTest(void) /* myLBA depends on primary vs secondary flag */ BuildTestGptData(gpt); - EXPECT(1 == CheckHeader(h1, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); BuildTestGptData(gpt); h1->my_lba--; h2->my_lba--; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); BuildTestGptData(gpt); h1->my_lba = 2; h2->my_lba--; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); /* We should ignore the alternate_lba field entirely */ BuildTestGptData(gpt); h1->alternate_lba++; h2->alternate_lba++; RefreshCrc32(gpt); - EXPECT(0 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(0 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(0 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(0 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); BuildTestGptData(gpt); h1->alternate_lba--; h2->alternate_lba--; RefreshCrc32(gpt); - EXPECT(0 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(0 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(0 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(0 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); BuildTestGptData(gpt); h1->entries_lba++; @@ -595,19 +597,19 @@ static int MyLbaTest(void) * We support a padding between primary GPT header and its entries. So * this still passes. */ - EXPECT(0 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(0 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); /* * But the secondary table should fail because it would overlap the * header, which is now lying after its entry array. */ - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); BuildTestGptData(gpt); h1->entries_lba--; h2->entries_lba--; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); + EXPECT(1 == CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0)); return TEST_OK; } @@ -656,9 +658,9 @@ static int FirstUsableLbaAndLastUsableLbaTest(void) h2->last_usable_lba = cases[i].secondary_last_usable_lba; RefreshCrc32(gpt); - EXPECT(CheckHeader(h1, 0, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h1, 0, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].primary_rv); - EXPECT(CheckHeader(h2, 1, gpt->drive_sectors, gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE) == + EXPECT(CheckHeader(h2, 1, gpt->streaming_drive_sectors, gpt->gpt_drive_sectors, 0) == cases[i].secondary_rv); } @@ -1424,50 +1426,50 @@ static int CheckHeaderOffDevice() RefreshCrc32(gpt); // GPT is stored on the same device so first usable lba should not // start at 0. - EXPECT(1 == CheckHeader(primary_header, 0, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(primary_header, 0, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, 0)); // But off device, it is okay to accept this GPT header. - EXPECT(0 == CheckHeader(primary_header, 0, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(0 == CheckHeader(primary_header, 0, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); BuildTestGptData(gpt); primary_header->number_of_entries = 100; RefreshCrc32(gpt); // Normally, number of entries is 128. So this should fail. - EXPECT(1 == CheckHeader(primary_header, 0, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); + EXPECT(1 == CheckHeader(primary_header, 0, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, 0)); // But off device, it is okay. - EXPECT(0 == CheckHeader(primary_header, 0, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(0 == CheckHeader(primary_header, 0, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); primary_header->number_of_entries = MIN_NUMBER_OF_ENTRIES - 1; RefreshCrc32(gpt); // However, too few entries is not good. - EXPECT(1 == CheckHeader(primary_header, 0, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(1 == CheckHeader(primary_header, 0, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); // Repeat for secondary header. BuildTestGptData(gpt); GptHeader* secondary_header = (GptHeader*)gpt->secondary_header; secondary_header->first_usable_lba = 0; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(secondary_header, 1, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(0 == CheckHeader(secondary_header, 1, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(1 == CheckHeader(secondary_header, 1, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, 0)); + EXPECT(0 == CheckHeader(secondary_header, 1, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); BuildTestGptData(gpt); secondary_header->number_of_entries = 100; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(secondary_header, 1, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_ON_DEVICE)); - EXPECT(0 == CheckHeader(secondary_header, 1, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(1 == CheckHeader(secondary_header, 1, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, 0)); + EXPECT(0 == CheckHeader(secondary_header, 1, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); secondary_header->number_of_entries = MIN_NUMBER_OF_ENTRIES - 1; RefreshCrc32(gpt); - EXPECT(1 == CheckHeader(secondary_header, 1, gpt->drive_sectors, - gpt->gpt_drive_sectors, GPT_STORED_OFF_DEVICE)); + EXPECT(1 == CheckHeader(secondary_header, 1, gpt->streaming_drive_sectors, + gpt->gpt_drive_sectors, GPT_FLAG_EXTERNAL)); return TEST_OK; } diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index c546ed12..6f47ae35 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -289,7 +289,7 @@ static void ReadWriteGptTest(void) GptHeader *h; g.sector_bytes = MOCK_SECTOR_SIZE; - g.drive_sectors = g.gpt_drive_sectors = MOCK_SECTOR_COUNT; + g.streaming_drive_sectors = g.gpt_drive_sectors = MOCK_SECTOR_COUNT; g.valid_headers = g.valid_entries = MASK_BOTH; ResetMocks(); @@ -315,11 +315,11 @@ static void ReadWriteGptTest(void) Memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary)); TEST_EQ(AllocAndReadGptData(handle, &g), 0, "AllocAndRead primary invalid"); - TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 1, "Primary header is invalid"); - TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 0, "Secondary header is valid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 1023, 1)\n" @@ -334,11 +334,11 @@ static void ReadWriteGptTest(void) Memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary)); TEST_EQ(AllocAndReadGptData(handle, &g), 0, "AllocAndRead secondary invalid"); - TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 0, "Primary header is valid"); - TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 1, "Secondary header is invalid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 2, 32)\n" @@ -354,11 +354,11 @@ static void ReadWriteGptTest(void) Memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary)); TEST_EQ(AllocAndReadGptData(handle, &g), 1, "AllocAndRead primary and secondary invalid"); - TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 1, "Primary header is invalid"); - TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 1, "Secondary header is invalid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 1023, 1)\n"); @@ -385,8 +385,8 @@ static void ReadWriteGptTest(void) "VbExDiskRead(h, 991, 32)\n" "VbExDiskWrite(h, 1, 1)\n" "VbExDiskWrite(h, 2, 32)\n"); - TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 0, "Fix Primary GPT: Primary header is valid"); /* @@ -410,8 +410,8 @@ static void ReadWriteGptTest(void) "VbExDiskRead(h, 1023, 1)\n" "VbExDiskWrite(h, 1023, 1)\n" "VbExDiskWrite(h, 991, 32)\n"); - TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.drive_sectors, - g.gpt_drive_sectors, GPT_STORED_ON_DEVICE), + TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, + g.gpt_drive_sectors, 0), 0, "Fix Secondary GPT: Secondary header is valid"); /* Data which is changed is written */ |