commit f02bbb4635175d6c3ba8f6557802f37e20160533
author Randall Spangler <rspangler@chromium.org> Wed Aug 24 14:16:01 2011 -0700
committer Randall Spangler <rspangler@chromium.org> Wed Aug 24 14:38:02 2011 -0700
tree 4e79dc4ab7bcf8fa84754a60f16f32e0685077eb
parent 1f5d53f7bd4dc590b47f21f858d021ac53190a17

Add tests for utility.h and sysincludes.h macros

BUG=chromium-os:17564
TEST=make && make runtests

Change-Id: Id0a834c2b234d5f9cbbb37a69426e2b97c734d0a
Reviewed-on: http://gerrit.chromium.org/gerrit/6608
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Randall Spangler <rspangler@chromium.org>

tests/vboot_common_tests.c

diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c
index adb5708..9180958 100644
--- a/tests/vboot_common_tests.c
+++ b/tests/vboot_common_tests.c
@@ -21,12 +21,32 @@
           "sizeof(VbKeyBlockHeader)");
   TEST_EQ(EXPECTED_VBFIRMWAREPREAMBLEHEADER2_0_SIZE,
           sizeof(VbFirmwarePreambleHeader2_0),
-          "sizeof(VbFirmwarePreambleHeader)");
+          "sizeof(VbFirmwarePreambleHeader2_0)");
   TEST_EQ(EXPECTED_VBFIRMWAREPREAMBLEHEADER2_1_SIZE,
           sizeof(VbFirmwarePreambleHeader),
           "sizeof(VbFirmwarePreambleHeader)");
   TEST_EQ(EXPECTED_VBKERNELPREAMBLEHEADER_SIZE,
           sizeof(VbKernelPreambleHeader), "sizeof(VbKernelPreambleHeader)");
+
+  TEST_EQ(VB_SHARED_DATA_HEADER_SIZE_V1,
+          (long)&((VbSharedDataHeader*)NULL)->recovery_reason,
+          "sizeof(VbSharedDataHeader) V1");
+
+  TEST_EQ(VB_SHARED_DATA_HEADER_SIZE_V2,
+          sizeof(VbSharedDataHeader),
+          "sizeof(VbSharedDataHeader) V2");
+}
+
+
+/* Test array sized macro */
+static void ArraySizeTest(void) {
+  uint8_t arr1[12];
+  uint32_t arr2[7];
+  uint64_t arr3[9];
+
+  TEST_EQ(ARRAY_SIZE(arr1), 12, "ARRAYSIZE(uint8_t)");
+  TEST_EQ(ARRAY_SIZE(arr2), 7, "ARRAYSIZE(uint32_t)");
+  TEST_EQ(ARRAY_SIZE(arr3), 9, "ARRAYSIZE(uint64_t)");
 }
 
 
@@ -112,6 +132,7 @@
   int error_code = 0;
 
   StructPackingTest();
+  ArraySizeTest();
   VerifyHelperFunctions();
 
   if (!gTestSuccess)