Assorted integration fixes.

tests/cgptlib_test.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <string.h>
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "cgptlib_test.h"
@@ skipping 153 matching lines @@
   Memcpy(header2, header, sizeof(GptHeader));
   Memcpy(entries2, entries, PARTITION_ENTRIES_SIZE);
   header2->my_lba = DEFAULT_DRIVE_SECTORS - 1;  /* 466 */
   header2->alternate_lba = 1;
   header2->entries_lba = DEFAULT_DRIVE_SECTORS - 1 - 32;  /* 434 */
 
   RefreshCrc32(gpt);
 }
 
 
+/* Tests if the structures are the expected size; if this fails,
+ * struct packing is not working properly. */
+static int StructSizeTest() {
+
+  EXPECT(GUID_EXPECTED_SIZE == sizeof(Guid));
+  EXPECT(GPTHEADER_EXPECTED_SIZE == sizeof(GptHeader));
+  EXPECT(GPTENTRY_EXPECTED_SIZE == sizeof(GptEntry));
+
+  return TEST_OK;
+}
+
+
 /* Tests if the default structure returned by BuildTestGptData() is good. */
 static int TestBuildTestGptData() {
   GptData* gpt;
 
   gpt = GetEmptyGptData();
   BuildTestGptData(gpt);
   EXPECT(GPT_SUCCESS == GptInit(gpt));
   return TEST_OK;
 }
 
@@ skipping 897 matching lines @@
 
 
 int main(int argc, char *argv[]) {
   int i;
   int error_count = 0;
   struct {
     char *name;
     test_func fp;
     int retval;
   } test_cases[] = {
+    { TEST_CASE(StructSizeTest), },
     { TEST_CASE(TestBuildTestGptData), },
     { TEST_CASE(ParameterTests), },
     { TEST_CASE(HeaderCrcTest), },
     { TEST_CASE(SignatureTest), },
     { TEST_CASE(RevisionTest), },
     { TEST_CASE(SizeTest), },
     { TEST_CASE(CrcFieldTest), },
     { TEST_CASE(ReservedFieldsTest), },
     { TEST_CASE(SizeOfPartitionEntryTest), },
     { TEST_CASE(NumberOfPartitionEntriesTest), },
@@ skipping 30 matching lines @@
     printf(COL_RED "The following %d test cases are failed:\n" COL_STOP,
            error_count);
     for (i = 0; i < sizeof(test_cases)/sizeof(test_cases[0]); ++i) {
       if (test_cases[i].retval)
         printf("  %s()\n", test_cases[i].name);
     }
   }
 
   return (error_count) ? 1 : 0;
 }